From 0ff1654e2805704066a28622e7575e087b6edf6c Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Tue, 26 May 2026 13:56:19 -0300 Subject: [PATCH 01/62] Exclude querydsl-apt-test test module from Maven Central deploy Signed-off-by: Marvin Froeder --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f71734b0da..c8cf69f262 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -410,7 +410,7 @@ jobs: name: 'Deploy Core Modules Sonatype' no_output_timeout: 4h command: | - ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease + ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease -pl '!:querydsl-apt-test' deployRelease: executor: @@ -426,7 +426,7 @@ jobs: name: 'Deploy Core Modules Sonatype' no_output_timeout: 4h command: | - ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease,staging + ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease,staging -pl '!:querydsl-apt-test' workflows: version: 2 From 145f02dfa3046b40501ac1eb3d4f6256d313fa65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 07:10:59 +0000 Subject: [PATCH 02/62] Build(deps): Bump hibernate.version from 7.3.6.Final to 7.4.0.Final Bumps `hibernate.version` from 7.3.6.Final to 7.4.0.Final. Updates `org.hibernate.orm:hibernate-core` from 7.3.6.Final to 7.4.0.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0) Updates `org.hibernate.orm:hibernate-envers` from 7.3.6.Final to 7.4.0.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0) Updates `org.hibernate.orm:hibernate-scan-jandex` from 7.3.6.Final to 7.4.0.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0) Updates `org.hibernate.orm:hibernate-community-dialects` from 7.3.6.Final to 7.4.0.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0) Updates `org.hibernate.orm:hibernate-c3p0` from 7.3.6.Final to 7.4.0.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.0/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.3.6...7.4.0) --- updated-dependencies: - dependency-name: org.hibernate.orm:hibernate-core dependency-version: 7.4.0.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.hibernate.orm:hibernate-envers dependency-version: 7.4.0.Final dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.hibernate.orm:hibernate-scan-jandex dependency-version: 7.4.0.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.hibernate.orm:hibernate-community-dialects dependency-version: 7.4.0.Final dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.hibernate.orm:hibernate-c3p0 dependency-version: 7.4.0.Final dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e481011129..a43785f119 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 1.0.0.RELEASE - 7.3.6.Final + 7.4.0.Final 9.1.0.Final 5.0.0-B13 3.2.0 From 375b3d4dee74e205ffa91e761f9dc50734bcb772 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 May 2026 07:11:49 +0000 Subject: [PATCH 03/62] Build(deps): Bump ksp.version from 2.3.8 to 2.3.9 Bumps `ksp.version` from 2.3.8 to 2.3.9. Updates `com.google.devtools.ksp:symbol-processing-api` from 2.3.8 to 2.3.9 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.3.8...2.3.9) Updates `com.google.devtools.ksp:symbol-processing-aa-embeddable` from 2.3.8 to 2.3.9 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.3.8...2.3.9) Updates `com.google.devtools.ksp:symbol-processing-common-deps` from 2.3.8 to 2.3.9 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.3.8...2.3.9) --- updated-dependencies: - dependency-name: com.google.devtools.ksp:symbol-processing-api dependency-version: 2.3.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.devtools.ksp:symbol-processing-aa-embeddable dependency-version: 2.3.9 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: com.google.devtools.ksp:symbol-processing-common-deps dependency-version: 2.3.9 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e481011129..a5e10b0d77 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 2.5.3 1.37 2.3.21 - 2.3.8 + 2.3.9 2.3.0 2.2.0 2.13.16 From 48464821e8b019b435162ee3e07bbfb2d09839e4 Mon Sep 17 00:00:00 2001 From: Marvin Date: Wed, 27 May 2026 13:14:32 -0300 Subject: [PATCH 04/62] Publish querydsl-bom as a real module so it auto-deploys to Central (#1763) --- pom.xml | 14 ++ querydsl-bom/pom.xml | 211 +++++++++++++++++++++++++ src/main/resources/bom-template.xml.vm | 50 ++++++ 3 files changed, 275 insertions(+) create mode 100644 querydsl-bom/pom.xml create mode 100644 src/main/resources/bom-template.xml.vm diff --git a/pom.xml b/pom.xml index a5e10b0d77..85a9a3826f 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ querydsl-tooling querydsl-libraries + querydsl-bom @@ -589,6 +590,7 @@ 0.300.0 false + ${project.baseUri}src/main/resources/bom-template.xml.vm querydsl-bom @@ -598,11 +600,23 @@ true + + + + install + deploy + + + io.github.openfeign.querydsl:* + *:querydsl-bom + *:querydsl-apt-test *:querydsl-examples *:querydsl-example-* *:querydsl-jpa-spring diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml new file mode 100644 index 0000000000..146627564e --- /dev/null +++ b/querydsl-bom/pom.xml @@ -0,0 +1,211 @@ + + + 4.0.0 + + + + + io.github.openfeign.querydsl + querydsl-root + 7.3-SNAPSHOT + ../pom.xml + + + querydsl-bom + pom + QueryDSL (Bill Of Materials) + Generated Bom + + + + + io.github.openfeign.querydsl + querydsl-core + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-codegen-utils + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-codegen + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-spatial + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-sql + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-sql-codegen + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-maven-plugin + 7.3-SNAPSHOT + maven-plugin + + + io.github.openfeign.querydsl + querydsl-jpa + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-jpa-codegen + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-kotlin-codegen + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-ksp-codegen + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-guava + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-collections + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-sql-spatial + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-sql-spring + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-sql-json + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-r2dbc + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-mongodb + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-scala + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-kotlin + 7.3-SNAPSHOT + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + general + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + hibernate + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + jakarta + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + jdo + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + jpa + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + morphia + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + roo + + + io.github.openfeign.querydsl + querydsl-apt + 7.3-SNAPSHOT + general-one + + + io.github.openfeign.querydsl + querydsl-jpa + 7.3-SNAPSHOT + apt-one-jar + + + io.github.openfeign.querydsl + querydsl-jpa + 7.3-SNAPSHOT + apt-hibernate-one-jar + + + io.github.openfeign.querydsl + querydsl-jpa + 7.3-SNAPSHOT + apt + + + io.github.openfeign.querydsl + querydsl-mongodb + 7.3-SNAPSHOT + apt-one-jar + + + io.github.openfeign.querydsl + querydsl-mongodb + 7.3-SNAPSHOT + apt + + + + diff --git a/src/main/resources/bom-template.xml.vm b/src/main/resources/bom-template.xml.vm new file mode 100644 index 0000000000..75df877a0f --- /dev/null +++ b/src/main/resources/bom-template.xml.vm @@ -0,0 +1,50 @@ + + + 4.0.0 + + + + + io.github.openfeign.querydsl + querydsl-root + ${model.version} + ../pom.xml + + + ${model.artifactId} + ${model.name} + pom + ${model.description} + + + #foreach($d in $model.dependencyManagement.dependencies) + + + ${d.groupId} + ${d.artifactId} + ${d.version}#if( $d.scope && $!d.scope != '' ) + + ${d.scope}#end#if( $d.type && $!d.type != '' && $!d.type != 'jar' && $!d.type != 'bundle') + + ${d.type}#end#if( $d.classifier && $!d.classifier != '' ) + + ${d.classifier}#end#if( $d.exclusions && $d.exclusions.size() > 0 ) + + #foreach( $e in $d.exclusions ) + + + ${e.groupId} + ${e.artifactId} + #end + + #end + + #end + + + + From 5f73b96c76d801a1080abedb65a3dffa9a061125 Mon Sep 17 00:00:00 2001 From: velo Date: Wed, 27 May 2026 16:27:46 -0300 Subject: [PATCH 05/62] Fix examples build with Hibernate 7.4 JAXB convergence --- querydsl-examples/querydsl-example-jpa-guice/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index da20f6b2d0..9eaab800f5 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -68,6 +68,12 @@ hibernate-c3p0 ${hibernate.version} + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.5 + runtime + io.github.openfeign.querydsl querydsl-jpa From d2a68a70d8f4eace77e1be553e0ffb4ae681589e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Panzer?= Date: Wed, 27 May 2026 21:55:54 +0200 Subject: [PATCH 06/62] fix(apt): circular dependencies are not problematic (#1761) --- .../apt/AbstractQuerydslProcessor.java | 2 ++ ...uerydslAnnotationProcessorCompileTest.java | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java index 4d19718821..03de30604c 100644 --- a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java +++ b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java @@ -739,6 +739,8 @@ private void dfs( for (Property property : current.getProperties()) { String neighborName = property.getType().getFullName(); + if (neighborName.equals(currentName)) continue; + EntityType neighbor = typeMap.get(neighborName); if (neighbor == null) continue; diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java index 846bedf562..270f8f0dc5 100644 --- a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java +++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java @@ -248,6 +248,29 @@ public class OrderItem { CompilationSubject.assertThat(compilation).hadWarningCount(0); } + @Test + void selfReference_noWarning() { + JavaFileObject orderSource = + JavaFileObjects.forSourceString( + "test.Order", + """ + package test; + + import com.querydsl.core.annotations.QueryEntity; + + @QueryEntity + public class Order { + public Order parent; + } + """); + + Compilation compilation = + javac().withProcessors(new QuerydslAnnotationProcessor()).compile(orderSource); + + CompilationSubject.assertThat(compilation).succeeded(); + CompilationSubject.assertThat(compilation).hadWarningCount(0); + } + @Test void indirectCircularReference_producesWarning() { JavaFileObject aSource = From 072009edc49e6eb834c08d93f4c0e04387bef73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=8A=B9=EC=B0=AC?= Date: Thu, 28 May 2026 05:09:38 +0900 Subject: [PATCH 07/62] Fix @QueryProjection constructor generation for Kotlin value classes (@JvmInline) (#1762) Fix @QueryProjection constructor generation for Kotlin value classes When a DTO annotated with @QueryProjection has constructor parameters of Kotlin value class types (@JvmInline), the APT processor failed to generate a constructor in the Q-type because ExtendedTypeFactory could not resolve the value class to a QueryDSL path type. Fix by detecting @JvmInline annotated classes in createClassType() and unwrapping them to their single underlying field type before type resolution. Also add null guard in TypeElementHandler.getType() as a defensive measure. Co-authored-by: Marvin Froeder --- .../com/querydsl/apt/ExtendedTypeFactory.java | 33 ++++++++++ .../com/querydsl/apt/TypeElementHandler.java | 3 + ...uerydslAnnotationProcessorCompileTest.java | 60 +++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java index a95567f1c6..b27546f21f 100644 --- a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java +++ b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/ExtendedTypeFactory.java @@ -37,9 +37,11 @@ import java.util.Set; import java.util.function.Function; import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.ErrorType; @@ -52,6 +54,7 @@ import javax.lang.model.type.TypeVariable; import javax.lang.model.type.TypeVisitor; import javax.lang.model.type.WildcardType; +import javax.lang.model.util.ElementFilter; import org.jetbrains.annotations.Nullable; /** @@ -373,8 +376,38 @@ private Type createType(TypeMirror typeMirror, List key, boolean deep) { } } + private boolean isKotlinValueClass(TypeElement typeElement) { + for (AnnotationMirror annotation : typeElement.getAnnotationMirrors()) { + if (annotation.getAnnotationType().toString().equals("kotlin.jvm.JvmInline")) { + return true; + } + } + return false; + } + + private TypeMirror getKotlinValueClassUnderlyingType(TypeElement typeElement) { + var instanceFields = new ArrayList(); + for (var field : ElementFilter.fieldsIn(typeElement.getEnclosedElements())) { + if (!field.getModifiers().contains(Modifier.STATIC)) { + instanceFields.add(field); + } + } + if (instanceFields.size() == 1) { + return instanceFields.get(0).asType(); + } + return null; + } + // TODO : simplify private Type createClassType(DeclaredType declaredType, TypeElement typeElement, boolean deep) { + // Kotlin value classes (@JvmInline) should be unwrapped to their underlying type + if (isKotlinValueClass(typeElement)) { + var underlyingType = getKotlinValueClassUnderlyingType(typeElement); + if (underlyingType != null) { + return getType(underlyingType, deep); + } + } + // other var name = typeElement.getQualifiedName().toString(); diff --git a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java index bddad76d85..5ae40d4512 100644 --- a/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java +++ b/querydsl-tooling/querydsl-apt/src/main/java/com/querydsl/apt/TypeElementHandler.java @@ -191,6 +191,9 @@ public EntityType handleProjectionType( private Type getType(VariableElement element) { Type rv = typeFactory.getType(element.asType(), true); + if (rv == null) { + return null; + } if (element.getAnnotation(QueryType.class) != null) { var qt = element.getAnnotation(QueryType.class); if (qt.value() != PropertyType.NONE) { diff --git a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java index 270f8f0dc5..4da91374c4 100644 --- a/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java +++ b/querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorCompileTest.java @@ -248,6 +248,66 @@ public class OrderItem { CompilationSubject.assertThat(compilation).hadWarningCount(0); } + @Test + void queryProjection_withKotlinValueClassParameter_generatesConstructor() throws Exception { + JavaFileObject jvmInlineAnnotation = + JavaFileObjects.forSourceString( + "kotlin.jvm.JvmInline", + """ + package kotlin.jvm; + + import java.lang.annotation.ElementType; + import java.lang.annotation.Retention; + import java.lang.annotation.RetentionPolicy; + import java.lang.annotation.Target; + + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.CLASS) + public @interface JvmInline {} + """); + + JavaFileObject valueClassSource = + JavaFileObjects.forSourceString( + "test.UserId", + """ + package test; + + import kotlin.jvm.JvmInline; + + @JvmInline + public final class UserId { + private final String value; + public UserId(String value) { this.value = value; } + public String getValue() { return value; } + } + """); + + JavaFileObject dtoSource = + JavaFileObjects.forSourceString( + "test.UserDto", + """ + package test; + + import com.querydsl.core.annotations.QueryProjection; + + public class UserDto { + @QueryProjection + public UserDto(UserId id, String name) {} + } + """); + + Compilation compilation = + javac() + .withProcessors(new QuerydslAnnotationProcessor()) + .compile(jvmInlineAnnotation, valueClassSource, dtoSource); + + CompilationSubject.assertThat(compilation).succeeded(); + var generated = compilation.generatedSourceFile("test.QUserDto").orElseThrow(); + var content = generated.getCharContent(false).toString(); + assertThat(content).contains("public QUserDto("); + assertThat(content).contains("Expression"); + } + @Test void selfReference_noWarning() { JavaFileObject orderSource = From 548e87f221a0fbd6583f0d6e8c33a20f66b8abbb Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Wed, 27 May 2026 16:17:14 -0400 Subject: [PATCH 08/62] Fix Hibernate 7.4 jakarta.xml.bind-api convergence via dependencyManagement Hibernate 7.4.0 brings jakarta.xml.bind-api 4.0.4 directly and 4.0.5 transitively (jaxb-runtime 4.0.7 -> jaxb-core), tripping the enforcer dependency-convergence rule in the JPA examples. Pin it to 4.0.5 in the querydsl-examples parent dependencyManagement (covers jpa-guice/quarkus/spring) and drop the earlier incomplete direct dependency in jpa-guice. Co-Authored-By: Claude Opus 4.7 (1M context) --- querydsl-examples/pom.xml | 8 ++++++++ querydsl-examples/querydsl-example-jpa-guice/pom.xml | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index b915a4e4f6..0284c79d30 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -45,6 +45,14 @@ log4j-core 2.26.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.5 + diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index 9eaab800f5..da20f6b2d0 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -68,12 +68,6 @@ hibernate-c3p0 ${hibernate.version} - - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.5 - runtime - io.github.openfeign.querydsl querydsl-jpa From 22034fb4ed33669da4d11bbaaaf59d28d809ec53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 05:33:49 +0000 Subject: [PATCH 09/62] Build(deps): Bump surefire.version from 3.5.5 to 3.5.6 Bumps `surefire.version` from 3.5.5 to 3.5.6. Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.5 to 3.5.6 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.5...surefire-3.5.6) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.5 to 3.5.6 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.5...surefire-3.5.6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-version: 3.5.6 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-version: 3.5.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea2af55e34..8c4618a38c 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 0.6.8 1.18.8 2.0.18 - 3.5.5 + 3.5.6 1.27 2.2.5 2.5.3 From 2d66c790b32b2f1999d6090456385ae564ce6c9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 05:34:00 +0000 Subject: [PATCH 10/62] Build(deps): Bump mongodb.version from 5.7.0 to 5.7.1 Bumps `mongodb.version` from 5.7.0 to 5.7.1. Updates `org.mongodb:mongodb-driver-sync` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.7.0...r5.7.1) Updates `org.mongodb:mongodb-driver-legacy` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.7.0...r5.7.1) --- updated-dependencies: - dependency-name: org.mongodb:mongodb-driver-sync dependency-version: 5.7.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.mongodb:mongodb-driver-legacy dependency-version: 5.7.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea2af55e34..f5c83010fa 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.53.1.0 13.10.00.35 6.0.5 - 5.7.0 + 5.7.1 1.0.0.RELEASE From 632ea3fd34110dea69c0ee18c3a9dd027d03d6d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 05:34:07 +0000 Subject: [PATCH 11/62] Build(deps): Bump com.github.siom79.japicmp:japicmp-maven-plugin Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.26.0 to 0.26.1. - [Release notes](https://github.com/siom79/japicmp/releases) - [Changelog](https://github.com/siom79/japicmp/blob/master/release.py) - [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.26.0...japicmp-base-0.26.1) --- updated-dependencies: - dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin dependency-version: 0.26.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea2af55e34..ffd918dbde 100644 --- a/pom.xml +++ b/pom.xml @@ -448,7 +448,7 @@ com.github.siom79.japicmp japicmp-maven-plugin - 0.26.0 + 0.26.1 From d3469cb088ece14b54026eb3e3020dd5503a0a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 05:34:28 +0000 Subject: [PATCH 12/62] Build(deps): Bump quarkus.version from 3.35.4 to 3.36.0 Bumps `quarkus.version` from 3.35.4 to 3.36.0. Updates `io.quarkus.platform:quarkus-bom` from 3.35.4 to 3.36.0 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.35.4...3.36.0) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.35.4 to 3.36.0 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.35.4...3.36.0) --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-version: 3.36.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-version: 3.36.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- querydsl-examples/querydsl-example-jpa-quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index a46cf61515..74253ea8c7 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -12,7 +12,7 @@ Querydsl example - JPA Quarkus - 3.35.4 + 3.36.0 From 502e7af93c63d6577529a8d3be732a5b3925a113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 05:35:38 +0000 Subject: [PATCH 13/62] Build(deps): Bump com.fasterxml.jackson.module:jackson-module-kotlin Bumps [com.fasterxml.jackson.module:jackson-module-kotlin](https://github.com/FasterXML/jackson-module-kotlin) from 2.21.3 to 2.21.4. - [Commits](https://github.com/FasterXML/jackson-module-kotlin/compare/jackson-module-kotlin-2.21.3...jackson-module-kotlin-2.21.4) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.module:jackson-module-kotlin dependency-version: 2.21.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-examples/querydsl-example-kotlin-codegen/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 910a765f31..317792a8df 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -28,7 +28,7 @@ com.fasterxml.jackson.module jackson-module-kotlin - 2.21.3 + 2.21.4 org.jetbrains.kotlin From 685f3b0c24de908015a746e23685d9e99ea51297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 05:36:13 +0000 Subject: [PATCH 14/62] Build(deps): Bump com.fasterxml.jackson:jackson-bom Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.21.3 to 2.21.4. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.21.3...jackson-bom-2.21.4) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-version: 2.21.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index d893347dd7..a277dd5438 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -17,7 +17,7 @@ com.fasterxml.jackson jackson-bom - 2.21.3 + 2.21.4 pom import From a6e72487dbc54aba673dbf50d291ebf81e8140f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 05:36:46 +0000 Subject: [PATCH 15/62] Build(deps): Bump mongodb.version from 5.7.1 to 5.8.0 Bumps `mongodb.version` from 5.7.1 to 5.8.0. Updates `org.mongodb:mongodb-driver-sync` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.7.1...r5.8.0) Updates `org.mongodb:mongodb-driver-legacy` from 5.7.1 to 5.8.0 - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.7.1...r5.8.0) --- updated-dependencies: - dependency-name: org.mongodb:mongodb-driver-sync dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.mongodb:mongodb-driver-legacy dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df1183317f..277ed422b7 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.53.1.0 13.10.00.35 6.0.5 - 5.7.1 + 5.8.0 1.0.0.RELEASE From 7e94db3c7220002325b1b99289b2dc5ad2a2d57d Mon Sep 17 00:00:00 2001 From: Jake Date: Mon, 1 Jun 2026 20:14:30 +0900 Subject: [PATCH 16/62] Route JPAInsertClause.execute() through native SQL when values contain function templates (#1757) (#1758) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Route JPAInsertClause.execute() through native SQL when values contain function templates (#1757) Detect TemplateExpression values via a shared hasTemplateValue() helper and route execute() to JpaNativeInsertSerializer + JDBC executeUpdate when present, falling back to the existing JPQL path otherwise. Same change applied to HibernateInsertClause. Adds executeUpdate(Connection, String, Object[]) to JpaInsertNativeHelper and regression tests covering both routing branches. Closes #1757 * Make JPAInsertClause.execute() native path provider-neutral Use the JPA-standard EntityManager.createNativeQuery instead of unwrapping a Hibernate Session, so the native routing for INSERTs with function templates also works under EclipseLink/OpenJPA. Addresses the backwards- compatibility review on #1758. HibernateInsertClause is intentionally unchanged — its native path continues to use Session.doReturningWork since that class is Hibernate-specific by design. --------- Co-authored-by: zio0911 --- .../querydsl/jpa/JpaInsertNativeHelper.java | 22 +++++- .../jpa/hibernate/HibernateInsertClause.java | 74 +++++++++++++++---- .../querydsl/jpa/impl/JPAInsertClause.java | 71 +++++++++++++++--- .../jpa/HibernateExecuteWithKeyTest.java | 39 ++++++++++ .../querydsl/jpa/JPAExecuteWithKeyTest.java | 39 ++++++++++ 5 files changed, 218 insertions(+), 27 deletions(-) diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JpaInsertNativeHelper.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JpaInsertNativeHelper.java index a3c668b688..a63be87053 100644 --- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JpaInsertNativeHelper.java +++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/JpaInsertNativeHelper.java @@ -30,8 +30,7 @@ /** * Helpers shared by {@link com.querydsl.jpa.impl.JPAInsertClause} and {@link - * com.querydsl.jpa.hibernate.HibernateInsertClause} to support {@code executeWithKey()} via native - * SQL INSERT. + * com.querydsl.jpa.hibernate.HibernateInsertClause} to execute INSERT statements via native SQL. * *

This is an internal API and not intended for direct use by application code. */ @@ -97,6 +96,25 @@ public static Object[] resolveConstants( return result; } + /** + * Execute a native SQL INSERT and return the number of affected rows. + * + * @param conn the JDBC connection (not closed by this method) + * @param sql the native SQL INSERT string + * @param params the parameter values to bind, in positional order + * @return the number of affected rows + * @throws SQLException if a database error occurs + */ + public static long executeUpdate(java.sql.Connection conn, String sql, Object[] params) + throws SQLException { + try (PreparedStatement stmt = conn.prepareStatement(sql)) { + for (int i = 0; i < params.length; i++) { + stmt.setObject(i + 1, params[i]); + } + return stmt.executeUpdate(); + } + } + /** * Execute a native SQL INSERT with {@code RETURN_GENERATED_KEYS} and return the generated key. * diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java index ffb286283a..577d1fe87b 100644 --- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java +++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/hibernate/HibernateInsertClause.java @@ -21,6 +21,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.Path; import com.querydsl.core.types.SubQueryExpression; +import com.querydsl.core.types.TemplateExpression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.HQLTemplates; import com.querydsl.jpa.JPAQueryMixin; @@ -89,21 +90,68 @@ public HibernateInsertClause( @Override public long execute() { - var serializer = new JPQLSerializer(templates, null); - serializer.serializeForInsert( - queryMixin.getMetadata(), - inserts.isEmpty() ? columns : inserts.keySet(), - values, - subQuery, - inserts); + if (subQuery != null || !hasTemplateValue()) { + var serializer = new JPQLSerializer(templates, null); + serializer.serializeForInsert( + queryMixin.getMetadata(), + inserts.isEmpty() ? columns : inserts.keySet(), + values, + subQuery, + inserts); + + Query query = session.createQuery(serializer.toString()); + for (Map.Entry, LockMode> entry : lockModes.entrySet()) { + query.setLockMode(entry.getKey().toString(), entry.getValue()); + } + HibernateUtil.setConstants( + query, serializer.getConstants(), queryMixin.getMetadata().getParams()); + return query.executeUpdate(); + } + + var effectiveColumns = JpaInsertNativeHelper.effectiveColumns(inserts, columns); + if (effectiveColumns.isEmpty()) { + throw new IllegalStateException("No columns specified for insert"); + } + var effectiveValues = JpaInsertNativeHelper.effectiveValues(inserts, values); - Query query = session.createQuery(serializer.toString()); - for (Map.Entry, LockMode> entry : lockModes.entrySet()) { - query.setLockMode(entry.getKey().toString(), entry.getValue()); + var entityClass = queryMixin.getMetadata().getJoins().get(0).getTarget().getType(); + + var serializer = new JpaNativeInsertSerializer(new Configuration(SQLTemplates.DEFAULT)); + serializer.serializeInsert(entityClass, effectiveColumns, effectiveValues); + + var sql = serializer.toString(); + var params = + JpaInsertNativeHelper.resolveConstants( + serializer.getConstants(), queryMixin.getMetadata().getParams()); + + return session.doReturningWork( + connection -> { + try { + return JpaInsertNativeHelper.executeUpdate(connection, sql, params); + } catch (SQLException e) { + throw new QueryException("Failed to execute insert", e); + } + }); + } + + /** + * Whether any value expression is a {@link TemplateExpression} — typically a schema-qualified + * function call from {@code SQLExpressions.function/stringFunction/numberFunction} that + * Hibernate's HQL parser cannot type-check. When true, we route through the native SQL path to + * bypass HQL semantic validation. + */ + private boolean hasTemplateValue() { + for (Object v : values) { + if (v instanceof TemplateExpression) { + return true; + } + } + for (Expression v : inserts.values()) { + if (v instanceof TemplateExpression) { + return true; + } } - HibernateUtil.setConstants( - query, serializer.getConstants(), queryMixin.getMetadata().getParams()); - return query.executeUpdate(); + return false; } /** diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java index 47eb0b53cf..39e83c6d5e 100644 --- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java +++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/impl/JPAInsertClause.java @@ -21,6 +21,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.Path; import com.querydsl.core.types.SubQueryExpression; +import com.querydsl.core.types.TemplateExpression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.JPAQueryMixin; import com.querydsl.jpa.JPQLSerializer; @@ -75,20 +76,66 @@ public JPAInsertClause(EntityManager em, EntityPath entity, JPQLTemplates tem @Override public long execute() { - var serializer = new JPQLSerializer(templates, entityManager); - serializer.serializeForInsert( - queryMixin.getMetadata(), - inserts.isEmpty() ? columns : inserts.keySet(), - values, - subQuery, - inserts); + if (subQuery != null || !hasTemplateValue()) { + var serializer = new JPQLSerializer(templates, entityManager); + serializer.serializeForInsert( + queryMixin.getMetadata(), + inserts.isEmpty() ? columns : inserts.keySet(), + values, + subQuery, + inserts); + + var query = entityManager.createQuery(serializer.toString()); + if (lockMode != null) { + query.setLockMode(lockMode); + } + JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams()); + return query.executeUpdate(); + } + + var effectiveColumns = JpaInsertNativeHelper.effectiveColumns(inserts, columns); + if (effectiveColumns.isEmpty()) { + throw new IllegalStateException("No columns specified for insert"); + } + var effectiveValues = JpaInsertNativeHelper.effectiveValues(inserts, values); + + var entityClass = queryMixin.getMetadata().getJoins().get(0).getTarget().getType(); + + var serializer = new JpaNativeInsertSerializer(new Configuration(SQLTemplates.DEFAULT)); + serializer.serializeInsert(entityClass, effectiveColumns, effectiveValues); - var query = entityManager.createQuery(serializer.toString()); - if (lockMode != null) { - query.setLockMode(lockMode); + var sql = serializer.toString(); + var params = + JpaInsertNativeHelper.resolveConstants( + serializer.getConstants(), queryMixin.getMetadata().getParams()); + + // Provider-neutral native execute: use the JPA standard EntityManager.createNativeQuery + // instead of unwrapping a Hibernate Session, so this path also works under EclipseLink/OpenJPA. + var nativeQuery = entityManager.createNativeQuery(sql); + for (int i = 0; i < params.length; i++) { + nativeQuery.setParameter(i + 1, params[i]); + } + return nativeQuery.executeUpdate(); + } + + /** + * Whether any value expression is a {@link TemplateExpression} — typically a schema-qualified + * function call from {@code SQLExpressions.function/stringFunction/numberFunction} that + * Hibernate's HQL parser cannot type-check. When true, we route through the native SQL path to + * bypass HQL semantic validation. + */ + private boolean hasTemplateValue() { + for (Object v : values) { + if (v instanceof TemplateExpression) { + return true; + } + } + for (Expression v : inserts.values()) { + if (v instanceof TemplateExpression) { + return true; + } } - JPAUtil.setConstants(query, serializer.getConstants(), queryMixin.getMetadata().getParams()); - return query.executeUpdate(); + return false; } /** diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java index dc4c78a254..07d01fffec 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java @@ -203,4 +203,43 @@ public void executeWithKey_rejects_subquery() { .executeWithKey(entity.id)) .isInstanceOf(UnsupportedOperationException.class); } + + @Test + public void execute_with_function_template_routes_through_native_sql() { + // Regression for #1757: execute() must route to native SQL when value expressions + // contain function templates, otherwise Hibernate's HQL parser rejects them. + var entity = QGeneratedKeyEntity.generatedKeyEntity; + long rows = + insert(entity) + .set( + entity.name, + Expressions.stringTemplate("upper({0})", Expressions.constant("hello"))) + .execute(); + + assertThat(rows).isEqualTo(1L); + + var stored = + (String) + session + .createNativeQuery("select name_ from generated_key_entity", String.class) + .getSingleResult(); + assertThat(stored).isEqualTo("HELLO"); + } + + @Test + public void execute_without_template_uses_jpql_path() { + // Regression for #1757: plain value INSERTs must keep using the JPQL path so + // JPA semantics (cascade, callbacks where applicable) are preserved. + var entity = QGeneratedKeyEntity.generatedKeyEntity; + long rows = insert(entity).set(entity.name, "plain").execute(); + + assertThat(rows).isEqualTo(1L); + + var stored = + (String) + session + .createNativeQuery("select name_ from generated_key_entity", String.class) + .getSingleResult(); + assertThat(stored).isEqualTo("plain"); + } } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java index a11cb9a34d..c9a84204e4 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java @@ -221,4 +221,43 @@ public void executeWithKey_rejects_subquery() { .executeWithKey(entity.id)) .isInstanceOf(UnsupportedOperationException.class); } + + @Test + public void execute_with_function_template_routes_through_native_sql() { + // Regression for #1757: execute() must route to native SQL when value expressions + // contain function templates, otherwise Hibernate's HQL parser rejects them. + var entity = QGeneratedKeyEntity.generatedKeyEntity; + long rows = + insert(entity) + .set( + entity.name, + Expressions.stringTemplate("upper({0})", Expressions.constant("hello"))) + .execute(); + + assertThat(rows).isEqualTo(1L); + + var stored = + (String) + entityManager + .createNativeQuery("select name_ from generated_key_entity") + .getSingleResult(); + assertThat(stored).isEqualTo("HELLO"); + } + + @Test + public void execute_without_template_uses_jpql_path() { + // Regression for #1757: plain value INSERTs must keep using the JPQL path so + // JPA semantics (cascade, callbacks where applicable) are preserved. + var entity = QGeneratedKeyEntity.generatedKeyEntity; + long rows = insert(entity).set(entity.name, "plain").execute(); + + assertThat(rows).isEqualTo(1L); + + var stored = + (String) + entityManager + .createNativeQuery("select name_ from generated_key_entity") + .getSingleResult(); + assertThat(stored).isEqualTo("plain"); + } } From 71b6186bf9f981c54d1eb579cd86d8fd59e89575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 17:13:54 +0000 Subject: [PATCH 17/62] Build(deps-dev): Bump io.mockk:mockk-jvm from 1.14.9 to 1.14.11 Bumps [io.mockk:mockk-jvm](https://github.com/mockk/mockk) from 1.14.9 to 1.14.11. - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.14.9...v1.14.11) --- updated-dependencies: - dependency-name: io.mockk:mockk-jvm dependency-version: 1.14.11 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 6a3cd31581..367344a1b4 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -50,7 +50,7 @@ io.mockk mockk-jvm - 1.14.9 + 1.14.11 test From 1cd6e57d2bc95b30c1e8aa2b5ecccd16b5c02211 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 17:14:51 +0000 Subject: [PATCH 18/62] Build(deps): Bump com.fasterxml.jackson:jackson-bom Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.21.4 to 2.22.0. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.21.4...jackson-bom-2.22.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-version: 2.22.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index a277dd5438..d1b9318214 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -17,7 +17,7 @@ com.fasterxml.jackson jackson-bom - 2.21.4 + 2.22.0 pom import From d99624270272ef61df0f66106530cbf4641947a5 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski <61804231+kamilkrzywanski@users.noreply.github.com> Date: Wed, 3 Jun 2026 13:15:07 +0200 Subject: [PATCH 19/62] Bump ibm image (old one is reported as ransomware by company firewall) (#1774) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3dfeffaf2b..ddf759bd32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,7 +66,7 @@ services: - "27017:27017" db2: - image: ibmcom/db2:11.5.0.0 + image: ibmcom/db2:11.5.8.0 platform: linux/amd64 privileged: true ports: From d396a92115d8fa3e2755fdf3ad8b2e864d085623 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:28:54 +0000 Subject: [PATCH 20/62] Build(deps): Bump org.openrewrite.recipe:rewrite-testing-frameworks Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.36.0 to 3.37.0. - [Release notes](https://github.com/openrewrite/rewrite-testing-frameworks/releases) - [Commits](https://github.com/openrewrite/rewrite-testing-frameworks/compare/v3.36.0...v3.37.0) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-testing-frameworks dependency-version: 3.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..ca3de3a9f3 100644 --- a/pom.xml +++ b/pom.xml @@ -1046,7 +1046,7 @@ org.openrewrite.recipe rewrite-testing-frameworks - 3.36.0 + 3.37.0 org.openrewrite.recipe From 40a320eeb3d2d41c0f5cf4739b7b7b88791f5be2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:46:52 +0000 Subject: [PATCH 21/62] Build(deps): Bump kotlin.version from 2.3.21 to 2.4.0 Bumps `kotlin.version` from 2.3.21 to 2.4.0. Updates `org.jetbrains.kotlin:kotlin-bom` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin:kotlin-scripting-jsr223` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.3.21 to 2.4.0 Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.3.21 to 2.4.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.21...v2.4.0) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.3.21 to 2.4.0 Updates `org.jetbrains.kotlin:kotlin-maven-noarg` from 2.3.21 to 2.4.0 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-bom dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-scripting-jsr223 dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-maven-noarg dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..c3d857e4f2 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 2.2.5 2.5.3 1.37 - 2.3.21 + 2.4.0 2.3.9 2.3.0 2.2.0 From 8ce73bda1301d7ba90b95c271f59346f38dbc50f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:47:08 +0000 Subject: [PATCH 22/62] Build(deps): Bump org.openrewrite.recipe:rewrite-migrate-java Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.35.0 to 3.36.0. - [Release notes](https://github.com/openrewrite/rewrite-migrate-java/releases) - [Commits](https://github.com/openrewrite/rewrite-migrate-java/compare/v3.35.0...v3.36.0) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-migrate-java dependency-version: 3.36.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..13284db4c6 100644 --- a/pom.xml +++ b/pom.xml @@ -1051,7 +1051,7 @@ org.openrewrite.recipe rewrite-migrate-java - 3.35.0 + 3.36.0 From e8ad6e0d9fe57602838861f0b2b67bb1915e81bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:47:22 +0000 Subject: [PATCH 23/62] Build(deps-dev): Bump dev.zacsweers.kctfork:core from 0.12.1 to 0.13.0 Bumps [dev.zacsweers.kctfork:core](https://github.com/zacsweers/kotlin-compile-testing) from 0.12.1 to 0.13.0. - [Release notes](https://github.com/zacsweers/kotlin-compile-testing/releases) - [Changelog](https://github.com/ZacSweers/kotlin-compile-testing/blob/main/CHANGELOG.md) - [Commits](https://github.com/zacsweers/kotlin-compile-testing/compare/0.12.1...0.13.0) --- updated-dependencies: - dependency-name: dev.zacsweers.kctfork:core dependency-version: 0.13.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 367344a1b4..2876ce9376 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -61,7 +61,7 @@ dev.zacsweers.kctfork core - 0.12.1 + 0.13.0 test From ea963c8239e97299a3660e8c538502a3bfe2046b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:47:32 +0000 Subject: [PATCH 24/62] Build(deps-dev): Bump org.openrewrite.maven:rewrite-maven-plugin Bumps [org.openrewrite.maven:rewrite-maven-plugin](https://github.com/openrewrite/rewrite-maven-plugin) from 6.40.0 to 6.41.0. - [Release notes](https://github.com/openrewrite/rewrite-maven-plugin/releases) - [Commits](https://github.com/openrewrite/rewrite-maven-plugin/compare/v6.40.0...v6.41.0) --- updated-dependencies: - dependency-name: org.openrewrite.maven:rewrite-maven-plugin dependency-version: 6.41.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..1d29804417 100644 --- a/pom.xml +++ b/pom.xml @@ -1040,7 +1040,7 @@ org.openrewrite.maven rewrite-maven-plugin - 6.40.0 + 6.41.0 From 435dd0e63e9b1e81544a23c78605ea42820c0ae8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:47:58 +0000 Subject: [PATCH 25/62] Build(deps): Bump quarkus.version from 3.36.0 to 3.36.1 Bumps `quarkus.version` from 3.36.0 to 3.36.1. Updates `io.quarkus.platform:quarkus-bom` from 3.36.0 to 3.36.1 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.0...3.36.1) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.36.0 to 3.36.1 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.0...3.36.1) --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-version: 3.36.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-version: 3.36.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-examples/querydsl-example-jpa-quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 74253ea8c7..48910fc387 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -12,7 +12,7 @@ Querydsl example - JPA Quarkus - 3.36.0 + 3.36.1 From 3dfec7a68d762da8ec8be25e1b8d0f028972bb49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:48:49 +0000 Subject: [PATCH 26/62] Build(deps-dev): Bump net.bytebuddy:byte-buddy from 1.18.8 to 1.18.10 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.18.8 to 1.18.10. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.18.8...byte-buddy-1.18.10) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-version: 1.18.10 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..89b8723549 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 3.9.16 33.6.0-jre 0.6.8 - 1.18.8 + 1.18.10 2.0.18 3.5.6 1.27 From d373629adf0852bf3966651bb6a011a3c9a70433 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 05:22:57 +0000 Subject: [PATCH 27/62] Build(deps): Bump org.xerial:sqlite-jdbc from 3.53.1.0 to 3.53.2.0 Bumps [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.53.1.0 to 3.53.2.0. - [Release notes](https://github.com/xerial/sqlite-jdbc/releases) - [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG) - [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.53.1.0...3.53.2.0) --- updated-dependencies: - dependency-name: org.xerial:sqlite-jdbc dependency-version: 3.53.2.0 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b44ea68ce..426ea78eef 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 9.7.0 13.4.0.jre11 9.3.9.0002 - 3.53.1.0 + 3.53.2.0 13.10.00.35 6.0.5 5.8.0 From f782690811820e5181767137770f2eadff785d69 Mon Sep 17 00:00:00 2001 From: velo Date: Fri, 5 Jun 2026 08:18:48 -0300 Subject: [PATCH 28/62] Align kctfork test dependencies --- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 2876ce9376..065c78de93 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -67,7 +67,7 @@ dev.zacsweers.kctfork ksp - 0.12.1 + 0.13.0 test com.google.devtools.ksp From 54169d541721f00d87dc0b8661e4f0a59ee9a390 Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Fri, 5 Jun 2026 16:54:08 -0300 Subject: [PATCH 29/62] Document release process in CONTRIBUTING Signed-off-by: Marvin Froeder --- CONTRIBUTING.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9367f10cd..89f156e4d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,3 +75,62 @@ docs/ 2. Make your changes and add tests where appropriate. 3. Run `./mvnw -Pdev verify` to make sure tests pass. 4. Open a pull request against `master`. + +## Releasing + +Releases are cut with the `scripts/release.sh` helper. **Never create a release +tag by hand** — manual tagging is how a release ends up pointing at a +`-SNAPSHOT` pom, which CircleCI happily builds while `central-publishing` +silently skips the upload (a green build that publishes nothing to Maven +Central). + +### Prerequisites + +- A clean working tree on the branch you are releasing (usually `master`). +- The pom version is the `-SNAPSHOT` you intend to release. The release version + is derived by stripping `-SNAPSHOT`, so set it deliberately beforehand: + - `7.3-SNAPSHOT` → releases `7.3` + - `7.3.0-SNAPSHOT` → releases `7.3.0` + +### Cut the release + +```bash +./scripts/release.sh +``` + +The script: + +1. Reads `project.version` and strips `-SNAPSHOT` to get the release version. +2. Runs `versions:set -DremoveSnapshot` across all modules and commits + `prepare release `, then tags that commit. +3. Bumps the poms to the next development iteration (`-SNAPSHOT`) and + commits `[ci skip] updating versions to next development iteration`. + +Because the version bump happens *before* the tag, the tag always points at a +non-SNAPSHOT pom. + +### Push + +The script keeps the changes local (`-DpushChanges=false`). Review, then push — +**pushing the tag is what triggers the release**: + +```bash +git log --oneline -3 # confirm the two commits and the new tag +git push origin master # the prepare-release + next-snapshot commits +git push origin # e.g. git push origin 7.3 — triggers deployRelease on CircleCI +``` + +### Verify it actually published + +A green CircleCI job is not proof — confirm all three: + +```bash +# 1. The tagged commit must NOT be a snapshot +git show :pom.xml | grep -m1 '' # must not contain -SNAPSHOT + +# 2. Watch the release workflow to green +# https://app.circleci.com/pipelines/gh/OpenFeign/querydsl + +# 3. Confirm artifacts landed (allow a few minutes for indexing) +# https://central.sonatype.com/artifact/io.github.openfeign.querydsl/querydsl-core +``` From 816c73382c9db198731d572638fdb04287fe9199 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 05:24:41 +0000 Subject: [PATCH 30/62] Build(deps-dev): Bump org.jacoco:jacoco-maven-plugin Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.14 to 0.8.15. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.14...v0.8.15) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.15 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 426ea78eef..5dec7d9eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -538,7 +538,7 @@ org.jacoco jacoco-maven-plugin - 0.8.14 + 0.8.15 com/querydsl/** From 83f956b31ef186c120570b0aefba3fe861d4c5a1 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski <61804231+kamilkrzywanski@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:17:26 +0200 Subject: [PATCH 31/62] Migration to junit5 (#1776) * Bump ibm image (old one is reported as ransomware by company firewall) * Migration of sql module to junit5 * Migration of spatial module to junit5 * Migration of apt test module to junit5 (tested locally, bc by default are skipped) + fixed NoteTest.java tests * Migration of codegen module to junit5 * Migration of codegen module to junit5 * Migration of collection module to junit5 * Migration of jpa codegen module to junit5 * Migration of r2dbc module to junit5 * Migration of jpa module to junit5 * Migration of maven module to junit5 * Migration of sql codegen module to junit5 * Migration of spatial module to junit5 * Migration of scala module to junit5 * Migration of kotlin and ksp module to junit5 * Migration of example modules to junit5 * Migration to junit 5 modules * Migration to junit 5 modules - fixed tests that never been runned (even wrong config) + fixed bug with dialect functions registration and fix MetaDataExporter bug * Migration to junit 5 modules - fixed tests that never been runned (even wrong config) + fixed bug with dialect functions registration and fix MetaDataExporter bug - velo requested changes --- pom.xml | 23 ++- .../example/jpa/guice/GuiceTestExtension.java | 16 ++ .../example/jpa/guice/GuiceTestRunner.java | 17 -- .../repository/AbstractPersistenceTest.java | 10 +- .../jpa/repository/TweetRepositoryTest.java | 2 +- .../jpa/repository/UserRepositoryTest.java | 2 +- .../examples/kotlin/ExampleEntityTest.kt | 2 +- .../examples/kotlin/ExampleEntityTest.kt | 2 +- .../examples/kotlin/ExampleEntityTest.kt | 2 +- .../querydsl/example/dao/AbstractDaoTest.java | 14 +- .../querydsl/example/dao/CustomerDaoTest.java | 2 +- .../querydsl/example/dao/OrderDaoTest.java | 2 +- .../querydsl/example/dao/PersonDaoTest.java | 2 +- .../querydsl/example/dao/ProductDaoTest.java | 2 +- .../querydsl/example/dao/SupplierDaoTest.java | 2 +- .../sql/guice/ConnectionContextTest.java | 10 +- .../example/sql/guice/GuiceTestExtension.java | 19 +++ .../example/sql/guice/GuiceTestRunner.java | 20 --- .../repository/AbstractPersistenceTest.java | 10 +- .../sql/repository/TweetRepositoryTest.java | 6 +- .../sql/repository/UserRepositoryTest.java | 2 +- .../querydsl/example/dao/AbstractDaoTest.java | 10 +- .../querydsl/example/dao/CustomerDaoTest.java | 2 +- .../querydsl/example/dao/OrderDaoTest.java | 2 +- .../querydsl/example/dao/PersonDaoTest.java | 2 +- .../querydsl/example/dao/ProductDaoTest.java | 2 +- .../querydsl/example/dao/SupplierDaoTest.java | 2 +- .../collections/AbstractQueryTest.java | 4 +- .../querydsl/collections/AggregationTest.java | 12 +- .../com/querydsl/collections/AliasTest.java | 6 +- .../com/querydsl/collections/AnimalTest.java | 2 +- .../querydsl/collections/BigDecimalTest.java | 2 +- .../com/querydsl/collections/BooleanTest.java | 2 +- .../com/querydsl/collections/CastTest.java | 2 +- .../com/querydsl/collections/CatTest.java | 10 +- .../collections/CollDeleteClauseTest.java | 2 +- .../collections/CollQueryFunctionsTest.java | 6 +- .../collections/CollQueryStandardTest.java | 15 +- .../collections/CollQueryTemplatesTest.java | 2 +- .../querydsl/collections/CollQueryTest.java | 13 +- .../collections/CollUpdateClauseTest.java | 2 +- .../collections/CollectionAnyTest.java | 2 +- .../querydsl/collections/CollectionTest.java | 6 +- .../collections/CompilationOverheadTest.java | 2 +- .../querydsl/collections/DistinctTest.java | 2 +- .../querydsl/collections/DocumentTest.java | 6 +- .../collections/ECJEvaluatorFactoryTest.java | 2 +- .../collections/EntityWithLongIdTest.java | 2 +- .../collections/EvaluatorTransformerTest.java | 2 +- .../collections/FirstResultContractTest.java | 2 +- .../collections/FunctionalHelpersTest.java | 2 +- .../querydsl/collections/GroupBy2Test.java | 6 +- .../querydsl/collections/GroupBy3Test.java | 2 +- .../querydsl/collections/GroupBy4Test.java | 2 +- .../com/querydsl/collections/GroupByTest.java | 32 ++-- .../querydsl/collections/InnerClassTest.java | 2 +- .../querydsl/collections/InnerJoinTest.java | 6 +- .../querydsl/collections/IterationTest.java | 2 +- .../collections/JSR310TimeTemplatesTest.java | 2 +- .../com/querydsl/collections/JacocoTest.java | 2 +- .../querydsl/collections/LeftJoinTest.java | 6 +- .../com/querydsl/collections/LoadTest.java | 7 +- .../collections/MappingProjectionTest.java | 2 +- .../com/querydsl/collections/MathTest.java | 2 +- .../com/querydsl/collections/MockTest.java | 2 +- .../collections/MultiComparatorTest.java | 2 +- .../querydsl/collections/NullSafetyTest.java | 2 +- .../com/querydsl/collections/NumberTest.java | 2 +- .../com/querydsl/collections/OrderTest.java | 2 +- .../com/querydsl/collections/PagingTest.java | 2 +- .../collections/PathComparatorTest.java | 6 +- .../querydsl/collections/PatternsTest.java | 2 +- .../querydsl/collections/PropertiesTest.java | 2 +- .../collections/QueryMetadataTest.java | 2 +- .../collections/QueryMutabilityTest.java | 2 +- .../collections/QueryPerformanceTest.java | 15 +- .../collections/SerializationTest.java | 6 +- .../collections/StringHandlingTest.java | 2 +- .../querydsl/collections/TypeCastTest.java | 22 ++- .../collections/UniqueResultContractTest.java | 10 +- .../querydsl/core/MatchingFiltersFactory.java | 2 + .../com/querydsl/core/TemplatesTestBase.java | 13 +- .../core/testutil/EmptyStatement.java | 26 --- .../querydsl/core/testutil/Parallelized.java | 39 ----- .../core/testutil/TravisFoldListener.java | 39 ----- .../querydsl/jpa/support/DialectSupport.java | 23 ++- .../jpa/support/QSQLServerDialect.java | 33 ++++ .../src/test/java/PackagelessEntityTest.java | 2 +- .../com/querydsl/jpa/AbstractJPATest.java | 39 +++-- .../com/querydsl/jpa/AbstractSQLTest.java | 18 ++- .../com/querydsl/jpa/AggregationTest.java | 2 +- .../querydsl/jpa/BooleanOperationsTest.java | 2 +- .../test/java/com/querydsl/jpa/CastTest.java | 2 +- .../java/com/querydsl/jpa/CollectionTest.java | 2 +- .../java/com/querydsl/jpa/ComparableTest.java | 2 +- .../com/querydsl/jpa/ConstructorsTest.java | 6 +- .../querydsl/jpa/CustomExpressionsTest.java | 2 +- .../java/com/querydsl/jpa/DateTimeTest.java | 2 +- .../com/querydsl/jpa/DependenciesTest.java | 2 +- .../test/java/com/querydsl/jpa/EJBQLTest.java | 2 +- .../jpa/ExpressionSerializationTest.java | 2 +- .../java/com/querydsl/jpa/FeaturesTest.java | 2 +- .../java/com/querydsl/jpa/HibernateBase.java | 15 +- .../jpa/HibernateExecuteWithKeyTest.java | 18 +-- .../querydsl/jpa/HibernateHandlerTest.java | 59 ++++--- .../jpa/HibernateQueryFactoryTest.java | 6 +- .../jpa/HibernateQueryMutabilityTest.java | 12 +- .../com/querydsl/jpa/HibernateQueryTest.java | 2 +- .../com/querydsl/jpa/HibernateSQLBase.java | 17 +- .../com/querydsl/jpa/IntegrationBase.java | 8 +- .../test/java/com/querydsl/jpa/JPABase.java | 30 ++-- .../jpa/JPACollectionAnyVisitorTest.java | 2 +- .../querydsl/jpa/JPAExecuteWithKeyTest.java | 18 +-- .../com/querydsl/jpa/JPAIntegrationBase.java | 13 +- .../querydsl/jpa/JPAProviderExtension.java | 58 +++++++ .../com/querydsl/jpa/JPAProviderRule.java | 42 ----- .../com/querydsl/jpa/JPAProviderTest.java | 12 +- ...AQueryConverterCollectionContainsTest.java | 16 +- .../jpa/JPAQueryCustomTypeWrapperTest.java | 12 +- .../com/querydsl/jpa/JPAQueryFactoryTest.java | 6 +- .../com/querydsl/jpa/JPAQueryMixinTest.java | 2 +- .../querydsl/jpa/JPAQueryMutability2Test.java | 29 ++-- .../querydsl/jpa/JPAQueryMutabilityTest.java | 12 +- .../java/com/querydsl/jpa/JPASQLBase.java | 21 +-- .../java/com/querydsl/jpa/JPQLQueryTest.java | 55 +++++-- .../com/querydsl/jpa/JPQLSerializerTest.java | 2 +- .../com/querydsl/jpa/JPQLTemplatesTest.java | 2 +- .../java/com/querydsl/jpa/JoinFlagsTest.java | 2 +- .../test/java/com/querydsl/jpa/JoinTest.java | 2 +- .../jpa/JpaNativeInsertSerializerTest.java | 23 +-- .../com/querydsl/jpa/MapOperationsTest.java | 2 +- .../test/java/com/querydsl/jpa/MathTest.java | 2 +- .../src/test/java/com/querydsl/jpa/Mode.java | 36 ++--- .../querydsl/jpa/NativeSQLSerializerTest.java | 2 +- .../querydsl/jpa/OrderExpressionsTest.java | 2 +- .../com/querydsl/jpa/OrderHelperTest.java | 2 +- .../com/querydsl/jpa/PackageVerification.java | 2 +- .../java/com/querydsl/jpa/ParsingTest.java | 20 +-- .../com/querydsl/jpa/QueryHandlerTest.java | 2 +- .../com/querydsl/jpa/QueryMutabilityTest.java | 6 +- .../querydsl/jpa/QueryPerformanceTest.java | 29 ++-- .../jpa/RelationalFunctionCallTest.java | 2 +- .../com/querydsl/jpa/SerializationBase.java | 8 +- .../java/com/querydsl/jpa/SignatureTest.java | 2 +- .../querydsl/jpa/StringOperationsTest.java | 2 +- .../java/com/querydsl/jpa/SubQueryTest.java | 4 +- .../com/querydsl/jpa/TargetExtension.java | 51 ++++++ .../java/com/querydsl/jpa/TargetRule.java | 37 ----- .../test/java/com/querydsl/jpa/TupleTest.java | 6 +- .../java/com/querydsl/jpa/TypeCastTest.java | 2 +- .../com/querydsl/jpa/UniqueResultsTest.java | 12 +- .../java/com/querydsl/jpa/domain/Account.java | 2 +- .../querydsl/jpa/suites/AbstractJPASuite.java | 7 +- .../querydsl/jpa/suites/AbstractSuite.java | 7 +- .../jpa/suites/DerbyEclipseLinkTest.java | 22 +-- .../querydsl/jpa/suites/DerbySuiteTest.java | 28 ++-- .../com/querydsl/jpa/suites/H2BatooTest.java | 26 +-- .../jpa/suites/H2EclipseLinkTest.java | 22 +-- .../querydsl/jpa/suites/H2OpenJPATest.java | 26 +-- .../com/querydsl/jpa/suites/H2SuiteTest.java | 28 ++-- .../jpa/suites/HSQLDBEclipseLinkTest.java | 22 +-- .../querydsl/jpa/suites/HSQLDBSuiteTest.java | 28 ++-- .../querydsl/jpa/suites/MSSQLSuiteTest.java | 28 ++-- .../jpa/suites/MySQLEclipseLinkTest.java | 22 +-- .../querydsl/jpa/suites/MySQLSuiteTest.java | 28 ++-- .../querydsl/jpa/suites/OracleSuiteTest.java | 32 ++-- .../PostgreSQLEclipseLinkSuiteTest.java | 22 +-- .../jpa/suites/PostgreSQLSuiteTest.java | 28 ++-- .../jpa/support/DialectSupportTest.java | 70 +++++++- .../support/JPAPathBuilderValidatorTest.java | 10 +- .../jpa/support/QSQLServerDialectTest.java | 76 +++++++++ ...unner.java => HibernateTestExtension.java} | 113 +++++++------ ...ATestRunner.java => JPATestExtension.java} | 84 +++------- .../test/resources/META-INF/persistence.xml | 8 +- .../querydsl/jpa/testutil/mssql.properties | 2 +- .../querydsl/jpa/testutil/mysql.properties | 2 +- .../querydsl/jpa/testutil/oracle.properties | 2 +- .../jpa/testutil/postgresql.properties | 2 +- .../src/test/resources/hibernate.cfg.xml | 2 +- .../com/querydsl/kotlin/CollectionTest.kt | 2 +- .../querydsl/mongodb/PackageVerification.java | 6 +- .../com/querydsl/r2dbc/AbstractBaseTest.java | 10 +- .../r2dbc/AbstractSQLTemplatesTest.java | 6 +- .../querydsl/r2dbc/BeanPopulationBase.java | 6 +- .../java/com/querydsl/r2dbc/CoalesceTest.java | 2 +- .../querydsl/r2dbc/ColumnMetadataTest.java | 2 +- .../com/querydsl/r2dbc/ConfigurationTest.java | 19 ++- .../querydsl/r2dbc/DateArithmeticTest.java | 7 +- .../java/com/querydsl/r2dbc/DeleteBase.java | 10 +- .../com/querydsl/r2dbc/DependenciesTest.java | 6 +- .../com/querydsl/r2dbc/ExtendedSQLTest.java | 2 +- .../com/querydsl/r2dbc/ForeignKeyTest.java | 2 +- .../com/querydsl/r2dbc/H2TemplatesTest.java | 2 +- .../java/com/querydsl/r2dbc/InsertBase.java | 47 +++--- .../querydsl/r2dbc/JDBCTypeMappingTest.java | 7 +- .../querydsl/r2dbc/JavaTypeMappingTest.java | 2 +- .../com/querydsl/r2dbc/JoinFlagsTest.java | 6 +- .../com/querydsl/r2dbc/JoinUsageTest.java | 18 ++- .../com/querydsl/r2dbc/KeyAccessorsTest.java | 2 +- .../test/java/com/querydsl/r2dbc/KeyTest.java | 2 +- .../querydsl/r2dbc/KeywordQuotingBase.java | 10 +- .../com/querydsl/r2dbc/LikeEscapeBase.java | 10 +- .../com/querydsl/r2dbc/ListSubQueryTest.java | 2 +- .../java/com/querydsl/r2dbc/MetadataTest.java | 6 +- .../java/com/querydsl/r2dbc/MultikeyTest.java | 2 +- .../querydsl/r2dbc/MySQLTemplatesTest.java | 2 +- .../com/querydsl/r2dbc/PaginationTest.java | 7 +- .../r2dbc/PostgreSQLTemplatesTest.java | 2 +- .../com/querydsl/r2dbc/PrecedenceTest.java | 2 +- .../java/com/querydsl/r2dbc/QBean2Test.java | 2 +- .../java/com/querydsl/r2dbc/QBeanTest.java | 2 +- .../java/com/querydsl/r2dbc/QPersonTest.java | 2 +- .../querydsl/r2dbc/QueryPerformanceTest.java | 21 ++- .../querydsl/r2dbc/R2DBCQueryFactoryTest.java | 6 +- .../com/querydsl/r2dbc/R2DBCQueryTest.java | 14 +- .../R2DBCRelationalFunctionCallTest.java | 2 +- .../r2dbc/RelationalPathExtractorTest.java | 2 +- .../querydsl/r2dbc/RelationalPathTest.java | 2 +- .../com/querydsl/r2dbc/SQLBindingsTest.java | 2 +- .../com/querydsl/r2dbc/SQLSerializerTest.java | 2 +- .../r2dbc/SQLServer2005TemplatesTest.java | 2 +- .../r2dbc/SQLServer2012TemplatesTest.java | 2 +- .../r2dbc/SQLServerTemplatesTest.java | 2 +- .../com/querydsl/r2dbc/SQLSubQueryTest.java | 47 +++--- .../com/querydsl/r2dbc/SQLTemplatesTest.java | 2 +- .../querydsl/r2dbc/SQLTypeMappingTest.java | 2 +- .../querydsl/r2dbc/SchemaAndTableTest.java | 2 +- .../java/com/querydsl/r2dbc/SelectBase.java | 64 +++++--- .../com/querydsl/r2dbc/SelectMySQLBase.java | 2 +- .../r2dbc/SelectWindowFunctionsBase.java | 2 +- .../com/querydsl/r2dbc/SerializationTest.java | 2 +- .../r2dbc/SkipForQuotedExtension.java | 30 ++++ .../com/querydsl/r2dbc/SkipForQuotedRule.java | 26 --- .../com/querydsl/r2dbc/SubqueriesBase.java | 2 +- .../com/querydsl/r2dbc/TargetExtension.java | 39 +++++ .../java/com/querydsl/r2dbc/TargetRule.java | 31 ---- .../java/com/querydsl/r2dbc/TemplateTest.java | 2 +- .../com/querydsl/r2dbc/TemplatesTest.java | 2 +- .../java/com/querydsl/r2dbc/TypesBase.java | 2 +- .../java/com/querydsl/r2dbc/UnionBase.java | 6 +- .../com/querydsl/r2dbc/UnionSubQueryTest.java | 2 +- .../java/com/querydsl/r2dbc/UpdateBase.java | 10 +- .../querydsl/r2dbc/WindowFunctionTest.java | 2 +- .../com/querydsl/r2dbc/WithinGroupTest.java | 2 +- .../r2dbc/dml/AbstractMapperTest.java | 4 +- .../r2dbc/dml/AnnotationMapperTest.java | 2 +- .../querydsl/r2dbc/dml/BeanMapperTest.java | 2 +- .../r2dbc/dml/R2DBCDeleteClauseTest.java | 35 ++-- .../r2dbc/dml/R2DBCInsertClauseTest.java | 17 +- .../r2dbc/dml/R2DBCUpdateClauseTest.java | 17 +- .../r2dbc/h2/GeneratedKeysH2Test.java | 10 +- .../com/querydsl/r2dbc/h2/H2QueryTest.java | 6 +- .../r2dbc/mssql/SQLServerQueryTest.java | 2 +- .../r2dbc/mssql/WindowFunctionTest.java | 2 +- .../r2dbc/mysql/GeneratedKeysMySQLTest.java | 15 +- .../r2dbc/mysql/MyR2DBCQueryTest.java | 6 +- .../mysql/R2DBCMySQLQueryFactoryTest.java | 6 +- .../R2DBCPostgreQueryFactoryTest.java | 6 +- .../postgresql/R2DBCPostgreQueryTest.java | 6 +- .../querydsl/r2dbc/suites/AbstractSuite.java | 4 - .../r2dbc/suites/H2ExceptionSuiteTest.java | 11 +- .../r2dbc/suites/H2LiteralsSuiteTest.java | 40 +++-- .../querydsl/r2dbc/suites/H2SuiteTest.java | 40 +++-- .../r2dbc/suites/H2WithQuotingTest.java | 37 +++-- .../r2dbc/suites/H2WithSchemaTest.java | 40 +++-- .../r2dbc/suites/MSSQLLiteralsSuiteTest.java | 43 +++-- .../querydsl/r2dbc/suites/MSSQLSuiteTest.java | 43 +++-- .../r2dbc/suites/MySQLLiteralsSuiteTest.java | 43 +++-- .../querydsl/r2dbc/suites/MySQLSuiteTest.java | 43 +++-- .../r2dbc/suites/MySQLWithQuotingTest.java | 40 +++-- .../suites/PostgreSQLLiteralsSuiteTest.java | 43 +++-- .../r2dbc/suites/PostgreSQLSuiteTest.java | 43 +++-- .../types/AbstractJSR310DateTimeTypeTest.java | 10 +- .../r2dbc/types/JSR310InstantTypeTest.java | 2 +- .../types/JSR310LocalDateTimeTypeTest.java | 2 +- .../r2dbc/types/JSR310LocalDateTypeTest.java | 2 +- .../r2dbc/types/JSR310LocalTimeTypeTest.java | 2 +- .../types/JSR310OffsetDateTimeTypeTest.java | 2 +- .../r2dbc/types/JSR310OffsetTimeTypeTest.java | 2 +- .../types/JSR310ZonedDateTimeTypeTest.java | 2 +- .../r2dbc/types/LocalDateTimeTest.java | 6 +- .../querydsl/r2dbc/types/LocaleTypeTest.java | 2 +- .../com/querydsl/r2dbc/types/TypeTest.java | 2 +- .../scala/CaseClassSerializerTest.scala | 2 +- .../com/querydsl/scala/ExpressionTest.scala | 4 +- .../scala/GenericExporterJPATest.scala | 2 +- .../querydsl/scala/GenericExporterTest.scala | 2 +- .../com/querydsl/scala/QPersonTest.scala | 4 +- .../querydsl/scala/ReflectionUtilsTest.scala | 4 +- .../scala/ScalaBeanSerializerTest.scala | 6 +- .../scala/ScalaEntitySerializerTest.scala | 6 +- .../scala/sql/JDBCIntegrationTest.scala | 12 +- .../scala/sql/MetaDataExporterTest.scala | 6 +- .../com/querydsl/scala/sql/PathsTest.scala | 4 +- .../querydsl/scala/sql/QuerySyntaxTest.scala | 4 +- .../sql/ScalaMetaDataSerializerTest.scala | 8 +- .../querydsl/spatial/GeometryPathTest.java | 2 +- .../HibernateSpatialSupportTest.java | 2 +- .../spatial/jts/JTSGeometryPathTest.java | 2 +- .../sql/spatial/GeoDBTemplatesTest.java | 2 +- .../spatial/MySQLSpatialTemplatesTest.java | 2 +- .../sql/spatial/PostGISTemplatesTest.java | 2 +- .../SQLServer2008SpatialTemplatesTest.java | 2 +- .../com/querydsl/sql/spatial/SpatialBase.java | 2 +- .../spatial/TeradataSpatialTemplatesTest.java | 2 +- .../spatial/suites/H2LiteralsSuiteTest.java | 13 +- .../sql/spatial/suites/H2SuiteTest.java | 13 +- .../suites/MSSQLLiteralsSuiteTest.java | 13 +- .../sql/spatial/suites/MSSQLSuiteTest.java | 13 +- .../suites/MySQLLiteralsSuiteTest.java | 13 +- .../sql/spatial/suites/MySQLSuiteTest.java | 13 +- .../suites/PostgreSQLLiteralsSuiteTest.java | 13 +- .../spatial/suites/PostgreSQLSuiteTest.java | 13 +- .../sql/spatial/suites/SpatialTest.java | 15 +- .../com/querydsl/sql/AbstractBaseTest.java | 10 +- .../com/querydsl/sql/AbstractJDBCTest.java | 8 +- .../sql/AbstractSQLTemplatesTest.java | 6 +- .../java/com/querydsl/sql/ArrayTypesTest.java | 6 +- .../com/querydsl/sql/BeanPopulationBase.java | 6 +- .../com/querydsl/sql/CUBRIDTemplatesTest.java | 4 +- .../java/com/querydsl/sql/CoalesceTest.java | 2 +- .../com/querydsl/sql/ColumnMetadataTest.java | 2 +- .../com/querydsl/sql/ConfigurationTest.java | 19 ++- .../java/com/querydsl/sql/Connections.java | 21 +++ .../com/querydsl/sql/ConnectionsTest.java | 2 +- .../com/querydsl/sql/DB2TemplatesTest.java | 2 +- .../com/querydsl/sql/DateArithmeticTest.java | 7 +- .../java/com/querydsl/sql/DeleteBase.java | 10 +- .../com/querydsl/sql/DependenciesTest.java | 6 +- .../com/querydsl/sql/DerbyTemplatesTest.java | 2 +- .../com/querydsl/sql/ExtendedSQLTest.java | 2 +- .../querydsl/sql/FirebirdTemplatesTest.java | 3 +- .../java/com/querydsl/sql/ForeignKeyTest.java | 2 +- .../com/querydsl/sql/H2TemplatesTest.java | 2 +- .../com/querydsl/sql/HSQLDBTemplatesTest.java | 2 +- .../java/com/querydsl/sql/InsertBase.java | 53 +++--- .../com/querydsl/sql/JDBCTypeMappingTest.java | 7 +- .../com/querydsl/sql/JavaTypeMappingTest.java | 2 +- .../java/com/querydsl/sql/JoinFlagsTest.java | 6 +- .../java/com/querydsl/sql/JoinUsageTest.java | 17 +- .../com/querydsl/sql/KeyAccessorsTest.java | 2 +- .../test/java/com/querydsl/sql/KeyTest.java | 2 +- .../com/querydsl/sql/KeywordQuotingBase.java | 10 +- .../java/com/querydsl/sql/LikeEscapeBase.java | 10 +- .../com/querydsl/sql/ListSubQueryTest.java | 2 +- .../test/java/com/querydsl/sql/MergeBase.java | 10 +- .../java/com/querydsl/sql/MergeUsingBase.java | 10 +- .../java/com/querydsl/sql/MetadataTest.java | 6 +- .../java/com/querydsl/sql/MultikeyTest.java | 2 +- .../com/querydsl/sql/MySQLTemplatesTest.java | 2 +- .../com/querydsl/sql/OracleTemplatesTest.java | 2 +- .../java/com/querydsl/sql/OracleTimeTest.java | 10 +- .../java/com/querydsl/sql/PaginationTest.java | 7 +- .../querydsl/sql/PostgreSQLTemplatesTest.java | 2 +- .../java/com/querydsl/sql/PrecedenceTest.java | 2 +- .../java/com/querydsl/sql/QBean2Test.java | 2 +- .../test/java/com/querydsl/sql/QBeanTest.java | 2 +- .../java/com/querydsl/sql/QPersonTest.java | 2 +- .../com/querydsl/sql/QueryMutabilityTest.java | 15 +- .../querydsl/sql/QueryPerformanceTest.java | 17 +- .../sql/RelationalFunctionCallTest.java | 2 +- .../sql/RelationalPathExtractorTest.java | 2 +- .../com/querydsl/sql/RelationalPathTest.java | 2 +- .../com/querydsl/sql/SQLBindingsTest.java | 2 +- .../querydsl/sql/SQLCloseListenerTest.java | 15 +- .../sql/SQLExpressionsFunctionTest.java | 2 +- .../com/querydsl/sql/SQLListenersTest.java | 2 +- .../com/querydsl/sql/SQLQueryFactoryTest.java | 6 +- .../java/com/querydsl/sql/SQLQueryTest.java | 14 +- .../com/querydsl/sql/SQLSerializerTest.java | 2 +- .../sql/SQLServer2005TemplatesTest.java | 2 +- .../sql/SQLServer2012TemplatesTest.java | 2 +- .../querydsl/sql/SQLServerTemplatesTest.java | 2 +- .../com/querydsl/sql/SQLSubQueryTest.java | 47 +++--- .../com/querydsl/sql/SQLTemplatesTest.java | 2 +- .../com/querydsl/sql/SQLTypeMappingTest.java | 2 +- .../com/querydsl/sql/SQLiteTemplatesTest.java | 3 +- .../com/querydsl/sql/SchemaAndTableTest.java | 2 +- .../java/com/querydsl/sql/SelectBase.java | 48 +++--- .../com/querydsl/sql/SelectMySQLBase.java | 2 +- .../com/querydsl/sql/SelectOracleBase.java | 6 +- .../com/querydsl/sql/SelectTeradataBase.java | 2 +- .../sql/SelectWindowFunctionsBase.java | 2 +- .../com/querydsl/sql/SerializationTest.java | 2 +- .../querydsl/sql/SkipForQuotedExtension.java | 30 ++++ .../com/querydsl/sql/SkipForQuotedRule.java | 26 --- .../java/com/querydsl/sql/SubqueriesBase.java | 2 +- .../com/querydsl/sql/TargetExtension.java | 39 +++++ .../java/com/querydsl/sql/TargetRule.java | 34 ---- .../java/com/querydsl/sql/TemplateTest.java | 2 +- .../java/com/querydsl/sql/TemplatesTest.java | 2 +- .../querydsl/sql/TeradataTemplatesTest.java | 2 +- .../test/java/com/querydsl/sql/TypesBase.java | 2 +- .../test/java/com/querydsl/sql/UnionBase.java | 6 +- .../com/querydsl/sql/UnionSubQueryTest.java | 2 +- .../java/com/querydsl/sql/UpdateBase.java | 10 +- .../com/querydsl/sql/WindowFunctionTest.java | 2 +- .../com/querydsl/sql/WithinGroupTest.java | 6 +- .../querydsl/sql/dml/AbstractMapperTest.java | 4 +- .../sql/dml/AnnotationMapperTest.java | 2 +- .../com/querydsl/sql/dml/BeanMapperTest.java | 2 +- .../querydsl/sql/dml/DefaultMapperTest.java | 2 +- .../querydsl/sql/dml/SQLDeleteClauseTest.java | 35 ++-- .../querydsl/sql/dml/SQLInsertClauseTest.java | 17 +- .../querydsl/sql/dml/SQLMergeClauseTest.java | 2 +- .../querydsl/sql/dml/SQLUpdateClauseTest.java | 17 +- .../querydsl/sql/h2/GeneratedKeysH2Test.java | 10 +- .../java/com/querydsl/sql/h2/H2QueryTest.java | 6 +- .../querydsl/sql/hsqldb/HsqldbQueryTest.java | 6 +- .../sql/mssql/SQLServerQueryTest.java | 2 +- .../sql/mssql/WindowFunctionTest.java | 2 +- .../sql/mysql/GeneratedKeysMySQLTest.java | 15 +- .../sql/mysql/MySQLQueryFactoryTest.java | 6 +- .../querydsl/sql/mysql/MySQLQueryTest.java | 6 +- .../sql/oracle/OracleGrammarTest.java | 2 +- .../sql/oracle/OracleQueryFactoryTest.java | 6 +- .../querydsl/sql/oracle/OracleQueryTest.java | 6 +- .../PostgreSQLQueryFactoryTest.java | 6 +- .../sql/postgresql/PostgreSQLQueryTest.java | 6 +- .../querydsl/sql/suites/AbstractSuite.java | 7 +- .../sql/suites/CUBRIDLiteralsSuiteTest.java | 47 +++--- .../querydsl/sql/suites/CUBRIDSuiteTest.java | 47 +++--- .../sql/suites/DB2LiteralsSuiteTest.java | 49 +++--- .../com/querydsl/sql/suites/DB2SuiteTest.java | 49 +++--- .../sql/suites/DerbyLiteralsSuiteTest.java | 43 +++-- .../querydsl/sql/suites/DerbySuiteTest.java | 43 +++-- .../sql/suites/FirebirdLiteralsSuiteTest.java | 43 +++-- .../sql/suites/FirebirdSuiteTest.java | 43 +++-- .../sql/suites/H2ExceptionSuiteTest.java | 11 +- .../sql/suites/H2LiteralsSuiteTest.java | 46 ++++-- .../com/querydsl/sql/suites/H2SuiteTest.java | 46 ++++-- .../sql/suites/H2WithQuotingTest.java | 43 +++-- .../querydsl/sql/suites/H2WithSchemaTest.java | 46 ++++-- .../sql/suites/HsqldbLiteralsSuiteTest.java | 43 +++-- .../querydsl/sql/suites/HsqldbSuiteTest.java | 43 +++-- .../sql/suites/MSSQLLiteralsSuiteTest.java | 49 +++--- .../querydsl/sql/suites/MSSQLSuiteTest.java | 49 +++--- .../sql/suites/MySQLLiteralsSuiteTest.java | 46 ++++-- .../querydsl/sql/suites/MySQLSuiteTest.java | 46 ++++-- .../sql/suites/MySQLWithQuotingTest.java | 43 +++-- .../sql/suites/OracleLiteralsSuiteTest.java | 49 +++--- .../querydsl/sql/suites/OracleSuiteTest.java | 49 +++--- .../sql/suites/OracleWithQuotingTest.java | 43 +++-- .../suites/PostgreSQLLiteralsSuiteTest.java | 53 +++--- .../sql/suites/PostgreSQLSuiteTest.java | 53 +++--- .../sql/suites/SQLiteLiteralsSuiteTest.java | 43 +++-- .../querydsl/sql/suites/SQLiteSuiteTest.java | 43 +++-- .../sql/teradata/SetQueryBandClauseTest.java | 6 +- .../com/querydsl/sql/types/ArrayTypeTest.java | 2 +- .../querydsl/sql/types/LocalDateTimeTest.java | 2 +- .../querydsl/sql/types/LocaleTypeTest.java | 2 +- .../java/com/querydsl/sql/types/TypeTest.java | 2 +- .../querydsl/apt/BooleanExtensionsTest.java | 15 +- .../com/querydsl/apt/DateExtensionsTest.java | 16 +- .../querydsl/apt/EclipseCompilationTest.java | 9 +- .../java/com/querydsl/apt/EmbeddableTest.java | 2 +- .../querydsl/apt/EntityExtensionsTest.java | 16 +- .../com/querydsl/apt/ExcludedClassesTest.java | 2 +- .../querydsl/apt/ExcludedPackagesTest.java | 2 +- .../com/querydsl/apt/GenericExporterTest.java | 7 +- .../java/com/querydsl/apt/GenericTest.java | 2 +- .../com/querydsl/apt/IncludedClassesTest.java | 2 +- .../querydsl/apt/IncludedPackagesTest.java | 2 +- .../apt/IncrementalCompilationTest.java | 6 +- .../querydsl/apt/IntegerExtensionsTest.java | 9 +- .../java/com/querydsl/apt/NamePrefixTest.java | 2 +- .../java/com/querydsl/apt/NameSuffixTest.java | 2 +- .../test/java/com/querydsl/apt/NoteTest.java | 17 +- .../com/querydsl/apt/PackageSuffixTest.java | 2 +- .../apt/QuerydslAnnotationProcessorTest.java | 2 +- .../querydsl/apt/UnknownAsEmbeddableTest.java | 2 +- .../apt/domain/AbstractClasses2Test.java | 2 +- .../apt/domain/AbstractClassesTest.java | 2 +- .../apt/domain/AbstractEntityTest.java | 2 +- .../apt/domain/AbstractProperties2Test.java | 2 +- .../apt/domain/AbstractProperties3Test.java | 6 +- .../apt/domain/AbstractPropertiesTest.java | 4 +- .../com/querydsl/apt/domain/AnimalTest.java | 2 +- .../apt/domain/AnnotatedGettersTest.java | 2 +- .../apt/domain/AnnotationTypeTest.java | 4 +- .../com/querydsl/apt/domain/AnyPathTest.java | 2 +- .../com/querydsl/apt/domain/AnyUsageTest.java | 2 +- .../com/querydsl/apt/domain/Array2Test.java | 2 +- .../com/querydsl/apt/domain/Array3Test.java | 2 +- .../com/querydsl/apt/domain/ArrayExtTest.java | 2 +- .../com/querydsl/apt/domain/ArrayTest.java | 2 +- .../com/querydsl/apt/domain/BlockingTest.java | 2 +- .../querydsl/apt/domain/CollectionTest.java | 2 +- .../querydsl/apt/domain/ComparableTest.java | 2 +- .../querydsl/apt/domain/ConstructorTest.java | 2 +- .../apt/domain/DeepInitializationTest.java | 2 +- .../querydsl/apt/domain/Delegate2Test.java | 2 +- .../querydsl/apt/domain/Delegate3Test.java | 2 +- .../com/querydsl/apt/domain/DelegateTest.java | 2 +- .../querydsl/apt/domain/Embeddable2Test.java | 8 +- .../querydsl/apt/domain/Embeddable3Test.java | 2 +- .../apt/domain/EmbeddableDeepTest.java | 4 +- .../apt/domain/EmbeddableInterfaceTest.java | 2 +- .../querydsl/apt/domain/EmbeddableTest.java | 4 +- .../querydsl/apt/domain/Embedded2Test.java | 2 +- .../com/querydsl/apt/domain/EmbeddedTest.java | 2 +- .../apt/domain/EntityInheritanceTest.java | 2 +- .../com/querydsl/apt/domain/EntityTest.java | 15 +- .../com/querydsl/apt/domain/Enum2Test.java | 4 +- .../com/querydsl/apt/domain/Enum3Test.java | 2 +- .../com/querydsl/apt/domain/Enum4Test.java | 4 +- .../com/querydsl/apt/domain/EnumTest.java | 2 +- .../apt/domain/ExcludedClassTest.java | 20 ++- .../querydsl/apt/domain/ExpressionTest.java | 2 +- .../apt/domain/ExtendsAndSuperTest.java | 2 +- .../apt/domain/ExternalEmbeddableTest.java | 4 +- .../apt/domain/ExternalEntityTest.java | 2 +- .../querydsl/apt/domain/Generic10Test.java | 2 +- .../querydsl/apt/domain/Generic11Test.java | 2 +- .../querydsl/apt/domain/Generic12Test.java | 2 +- .../querydsl/apt/domain/Generic13Test.java | 2 +- .../querydsl/apt/domain/Generic14Test.java | 2 +- .../querydsl/apt/domain/Generic15Test.java | 2 +- .../querydsl/apt/domain/Generic16Test.java | 2 +- .../com/querydsl/apt/domain/Generic2Test.java | 2 +- .../com/querydsl/apt/domain/Generic3Test.java | 2 +- .../com/querydsl/apt/domain/Generic4Test.java | 2 +- .../com/querydsl/apt/domain/Generic5Test.java | 2 +- .../com/querydsl/apt/domain/Generic6Test.java | 2 +- .../com/querydsl/apt/domain/Generic7Test.java | 2 +- .../com/querydsl/apt/domain/Generic8Test.java | 2 +- .../com/querydsl/apt/domain/Generic9Test.java | 2 +- .../apt/domain/GenericSignatureTest.java | 2 +- .../apt/domain/GenericStackOverflowTest.java | 2 +- .../com/querydsl/apt/domain/GenericTest.java | 2 +- .../querydsl/apt/domain/Hierarchy2Test.java | 4 +- .../querydsl/apt/domain/HierarchyTest.java | 2 +- .../com/querydsl/apt/domain/InitTest.java | 2 +- .../apt/domain/InnerExtensionsTest.java | 9 +- .../apt/domain/InterfaceType2Test.java | 2 +- .../apt/domain/InterfaceType3Test.java | 2 +- .../apt/domain/InterfaceTypeTest.java | 2 +- .../java/com/querydsl/apt/domain/JPATest.java | 2 +- .../com/querydsl/apt/domain/JSR310Test.java | 2 +- .../apt/domain/JSR310TimeSupportTest.java | 2 +- .../querydsl/apt/domain/JodaMoneyTest.java | 2 +- .../com/querydsl/apt/domain/KeywordsTest.java | 2 +- .../apt/domain/LiteralEntityTest.java | 2 +- .../querydsl/apt/domain/ManagedEmailTest.java | 2 +- .../querydsl/apt/domain/ManyToManyTest.java | 2 +- .../apt/domain/MonitoredCompanyTest.java | 2 +- .../com/querydsl/apt/domain/NumberTest.java | 4 +- .../com/querydsl/apt/domain/OneToOneTest.java | 2 +- .../com/querydsl/apt/domain/OrderTest.java | 2 +- .../querydsl/apt/domain/PathMetadataTest.java | 10 +- .../com/querydsl/apt/domain/PathTest.java | 2 +- .../com/querydsl/apt/domain/PersonTest.java | 2 +- .../querydsl/apt/domain/Properties2Test.java | 11 +- .../querydsl/apt/domain/Properties3Test.java | 2 +- .../querydsl/apt/domain/Properties4Test.java | 2 +- .../querydsl/apt/domain/PropertiesTest.java | 2 +- .../querydsl/apt/domain/PropertyTypeTest.java | 6 +- .../apt/domain/QueryByExampleTest.java | 2 +- .../apt/domain/QueryEmbeddable2Test.java | 2 +- .../apt/domain/QueryEmbeddable3Test.java | 2 +- .../apt/domain/QueryEmbeddableTest.java | 2 +- .../apt/domain/QueryEmbedded2Test.java | 2 +- .../apt/domain/QueryEmbedded3Test.java | 2 +- .../apt/domain/QueryEmbedded4Test.java | 2 +- .../apt/domain/QueryEmbedded5Test.java | 2 +- .../apt/domain/QueryEmbedded6Test.java | 2 +- .../apt/domain/QueryEmbedded7Test.java | 2 +- .../apt/domain/QueryEmbeddedTest.java | 2 +- .../querydsl/apt/domain/QueryExcludeTest.java | 2 +- .../querydsl/apt/domain/QueryInit2Test.java | 2 +- .../querydsl/apt/domain/QueryInit3Test.java | 2 +- .../querydsl/apt/domain/QueryInit4Test.java | 2 +- .../querydsl/apt/domain/QueryInit5Test.java | 2 +- .../querydsl/apt/domain/QueryInit6Test.java | 2 +- .../querydsl/apt/domain/QueryInit7Test.java | 2 +- .../querydsl/apt/domain/QueryInitTest.java | 2 +- .../domain/QueryProjectionBuilderTest.java | 6 +- .../apt/domain/QueryProjectionTest.java | 2 +- .../domain/QueryTypeOverTransientTest.java | 2 +- .../querydsl/apt/domain/QueryTypeTest.java | 2 +- .../apt/domain/QuerydslConfig2Test.java | 10 +- .../apt/domain/QuerydslConfigTest.java | 2 +- .../java/com/querydsl/apt/domain/RawTest.java | 2 +- .../com/querydsl/apt/domain/RelationTest.java | 2 +- .../apt/domain/ReservedNamesInTypesTest.java | 2 +- .../apt/domain/ReservedNamesTest.java | 2 +- .../querydsl/apt/domain/SignatureTest.java | 2 +- .../querydsl/apt/domain/SimpleTypesTest.java | 2 +- .../querydsl/apt/domain/Superclass2Test.java | 2 +- .../querydsl/apt/domain/Superclass3Test.java | 2 +- .../querydsl/apt/domain/Superclass4Test.java | 2 +- .../querydsl/apt/domain/Superclass5Test.java | 2 +- .../querydsl/apt/domain/SuperclassTest.java | 4 +- .../querydsl/apt/domain/Temporal2Test.java | 2 +- .../com/querydsl/apt/domain/TemporalTest.java | 2 +- .../querydsl/apt/domain/TransientTest.java | 2 +- .../com/querydsl/apt/domain/p6/TypeTest.java | 2 +- .../apt/inheritance/Inheritance11Test.java | 2 +- .../apt/inheritance/Inheritance2Test.java | 4 +- .../apt/inheritance/Inheritance3Test.java | 2 +- .../apt/inheritance/Inheritance4Test.java | 2 +- .../apt/inheritance/Inheritance5Test.java | 2 +- .../apt/inheritance/Inheritance6Test.java | 2 +- .../apt/inheritance/Inheritance7Test.java | 8 +- .../apt/inheritance/Inheritance8Test.java | 2 +- .../apt/inheritance/Inheritance9Test.java | 2 +- .../apt/inheritance/InheritanceTest.java | 2 +- .../src/test/java/NestedTest.java | 2 +- .../codegen/utils/AnnotationTest.java | 4 +- .../codegen/utils/ComplexEvaluationTest.java | 33 ++-- .../utils/ECJEvaluatorFactoryTest.java | 6 +- .../codegen/utils/InnerClassesTest.java | 2 +- .../utils/JDKEvaluatorFactoryTest.java | 6 +- .../codegen/utils/JavaWriterTest.java | 18 +-- .../codegen/utils/MemJavaFileObjectTest.java | 2 +- .../utils/MemSourceFileObjectTest.java | 2 +- .../codegen/utils/ScalaWriterTest.java | 18 +-- .../codegen/utils/SimpleCompilerTest.java | 10 +- .../codegen/utils/SurefireBooterTest.java | 2 +- .../codegen/utils/model/ClassTypeTest.java | 2 +- .../codegen/utils/model/ConstructorTest.java | 2 +- .../codegen/utils/model/ParameterTest.java | 2 +- .../codegen/utils/model/SimpleTypeTest.java | 2 +- .../codegen/utils/model/TypeAdapterTest.java | 2 +- .../codegen/utils/model/TypeCategoryTest.java | 2 +- .../codegen/utils/model/TypeExtendsTest.java | 2 +- .../codegen/utils/model/TypeSuperTest.java | 2 +- .../codegen/utils/model/TypeTest.java | 2 +- .../codegen/utils/support/ClassUtilsTest.java | 2 +- .../src/test/resources/testAnnotations | 2 +- .../src/test/resources/testAnnotations2 | 2 +- .../src/test/resources/testBasic | 2 +- .../src/test/resources/testInterface | 2 +- .../src/test/resources/testJavadoc | 2 +- .../codegen/AbstractExporterTest.java | 2 +- .../querydsl/codegen/BeanSerializerTest.java | 6 +- .../querydsl/codegen/ClassPathUtilsTest.java | 2 +- .../querydsl/codegen/CodegenModuleTest.java | 8 +- .../com/querydsl/codegen/CustomTypeTest.java | 2 +- .../com/querydsl/codegen/DelegateTest.java | 2 +- .../codegen/EmbeddableSerializerTest.java | 2 +- .../codegen/EntitySerializerTest.java | 2 +- .../com/querydsl/codegen/EntityTypeTest.java | 2 +- .../codegen/ExternalEmbeddableTest.java | 4 +- .../GeneratedAnnotationResolverTest.java | 2 +- .../com/querydsl/codegen/Generic2Test.java | 2 +- .../querydsl/codegen/GenericExporterTest.java | 132 +++++++-------- .../com/querydsl/codegen/GenericTest.java | 2 +- .../codegen/GroovyBeanSerializerTest.java | 6 +- .../querydsl/codegen/Inheritance2Test.java | 2 +- .../querydsl/codegen/PackageSuffixTest.java | 2 +- .../codegen/ProjectionSerializerTest.java | 2 +- .../com/querydsl/codegen/PropertyTest.java | 2 +- .../codegen/QueryTypeFactoryTest.java | 2 +- .../com/querydsl/codegen/ScalaTypeDump.java | 6 +- .../com/querydsl/codegen/SerializerTest.java | 6 +- .../com/querydsl/codegen/TypeFactoryTest.java | 2 +- .../querydsl/codegen/TypeMappingsTest.java | 2 +- .../jpa/codegen/JPADomainExporterTest.java | 43 ++--- .../codegen/ant/AntJPADomainExporterTest.java | 15 +- .../codegen/EmbeddableSerializerTest.kt | 7 +- .../kotlin/codegen/EntitySerializerTest.kt | 7 +- .../codegen/ProjectionSerializerTest.kt | 3 +- .../kotlin/KspProcessorIntegrationTest.kt | 6 +- .../src/test/kotlin/RenderTest.kt | 3 +- .../com/querydsl/maven/CompileMojoTest.java | 2 +- .../maven/GenericExporterMojoTest.java | 2 +- .../querydsl/maven/JPAExporterMojoTest.java | 2 +- .../maven/MetadataExportMojoTest.java | 54 +++---- .../maven/TestMetadataExportMojoTest.java | 2 +- .../sql/codegen/MetaDataExporter.java | 6 +- .../querydsl/sql/codegen/CustomTypesTest.java | 9 +- .../codegen/DefaultNamingStrategyTest.java | 6 +- .../querydsl/sql/codegen/ExportBaseTest.java | 16 +- .../querydsl/sql/codegen/ExportDerbyTest.java | 9 +- .../querydsl/sql/codegen/ExportH2Test.java | 9 +- .../sql/codegen/ExportH2TwoSchemasTest.java | 28 ++-- .../sql/codegen/ExportHsqldbTest.java | 9 +- .../querydsl/sql/codegen/ExportMSSQLTest.java | 9 +- .../querydsl/sql/codegen/ExportMySQLTest.java | 9 +- .../sql/codegen/ExportOracleTest.java | 9 +- .../sql/codegen/ExportPostgreSQLTest.java | 9 +- .../sql/codegen/ExportSQLiteTest.java | 9 +- .../codegen/ExtendedBeanSerializerTest.java | 19 +-- .../codegen/ExtendedNamingStrategyTest.java | 6 +- .../sql/codegen/KeyDataFactoryTest.java | 2 +- .../sql/codegen/MetaDataExporterAllTest.java | 89 +++++----- ...MetaDataExporterColumnDefOrderingTest.java | 126 +++++++++++++++ .../sql/codegen/MetaDataExporterTest.java | 153 +++++++++--------- .../sql/codegen/MetaDataSerializerTest.java | 19 ++- .../querydsl/sql/codegen/MetaDataTest.java | 6 +- .../codegen/OriginalNamingStrategyTest.java | 6 +- .../codegen/ant/AntMetaDataExporterTest.java | 6 +- .../codegen/support/RenameMappingTest.java | 2 +- 694 files changed, 4004 insertions(+), 3180 deletions(-) create mode 100644 querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestExtension.java delete mode 100644 querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java create mode 100644 querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestExtension.java delete mode 100644 querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java delete mode 100644 querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java delete mode 100644 querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java delete mode 100644 querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java create mode 100644 querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServerDialect.java create mode 100644 querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderExtension.java delete mode 100644 querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java create mode 100644 querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetExtension.java delete mode 100644 querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java create mode 100644 querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/QSQLServerDialectTest.java rename querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/{HibernateTestRunner.java => HibernateTestExtension.java} (57%) rename querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/{JPATestRunner.java => JPATestExtension.java} (56%) create mode 100644 querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedExtension.java delete mode 100644 querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedRule.java create mode 100644 querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetExtension.java delete mode 100644 querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetRule.java create mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedExtension.java delete mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java create mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetExtension.java delete mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java create mode 100644 querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterColumnDefOrderingTest.java diff --git a/pom.xml b/pom.xml index 5dec7d9eb5..34a2b9c190 100644 --- a/pom.xml +++ b/pom.xml @@ -300,11 +300,6 @@ junit-jupiter-api test - - org.junit.vintage - junit-vintage-engine - test - org.easymock easymock @@ -989,6 +984,17 @@ com.querydsl.core.testutil.Database, com.querydsl.core.testutil.MongoDB, + com.querydsl.core.testutil.CUBRID, + com.querydsl.core.testutil.DB2, + com.querydsl.core.testutil.Derby, + com.querydsl.core.testutil.Firebird, + com.querydsl.core.testutil.H2, + com.querydsl.core.testutil.HSQLDB, + com.querydsl.core.testutil.MySQL, + com.querydsl.core.testutil.Oracle, + com.querydsl.core.testutil.PostgreSQL, + com.querydsl.core.testutil.SQLite, + com.querydsl.core.testutil.SQLServer, com.querydsl.core.testutil.SlowTest, com.querydsl.core.testutil.Performance, com.querydsl.core.testutil.ReportingOnly @@ -1009,6 +1015,13 @@ com.querydsl.core.testutil.ExternalDatabase, com.querydsl.core.testutil.MongoDB, + com.querydsl.core.testutil.CUBRID, + com.querydsl.core.testutil.DB2, + com.querydsl.core.testutil.Firebird, + com.querydsl.core.testutil.MySQL, + com.querydsl.core.testutil.Oracle, + com.querydsl.core.testutil.PostgreSQL, + com.querydsl.core.testutil.SQLServer, com.querydsl.core.testutil.SlowTest, com.querydsl.core.testutil.Performance, com.querydsl.core.testutil.ReportingOnly diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestExtension.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestExtension.java new file mode 100644 index 0000000000..c538ce969e --- /dev/null +++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestExtension.java @@ -0,0 +1,16 @@ +package com.querydsl.example.jpa.guice; + +import com.google.inject.Guice; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstanceFactory; +import org.junit.jupiter.api.extension.TestInstanceFactoryContext; + +/** JUnit 5 replacement for the former {@code GuiceTestRunner}: builds test instances via Guice. */ +public class GuiceTestExtension implements TestInstanceFactory { + + @Override + public Object createTestInstance( + TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) { + return Guice.createInjector(new ServiceModule()).getInstance(factoryContext.getTestClass()); + } +} diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java deleted file mode 100644 index 241e48133b..0000000000 --- a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/guice/GuiceTestRunner.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.querydsl.example.jpa.guice; - -import com.google.inject.Guice; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.InitializationError; - -public class GuiceTestRunner extends BlockJUnit4ClassRunner { - - public GuiceTestRunner(Class klass) throws InitializationError { - super(klass); - } - - @Override - protected Object createTest() throws Exception { - return Guice.createInjector(new ServiceModule()).getInstance(getTestClass().getJavaClass()); - } -} diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java index 6ad47770f5..cea9b1f494 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java +++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java @@ -1,7 +1,7 @@ package com.querydsl.example.jpa.repository; import com.google.inject.persist.Transactional; -import com.querydsl.example.jpa.guice.GuiceTestRunner; +import com.querydsl.example.jpa.guice.GuiceTestExtension; import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.persistence.EntityManager; @@ -11,14 +11,14 @@ import java.util.List; import org.hibernate.Session; import org.hibernate.jdbc.Work; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(GuiceTestRunner.class) +@ExtendWith(GuiceTestExtension.class) public abstract class AbstractPersistenceTest { @Inject private Provider em; - @Before + @BeforeEach @Transactional public void before() { var entityManager = em.get(); diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java index 8e0e454f92..f6d2bd94e0 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java +++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TweetRepositoryTest extends AbstractPersistenceTest { @Inject private TweetRepository repository; diff --git a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java index cea96164bb..5254d23d73 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java +++ b/querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java @@ -4,7 +4,7 @@ import com.querydsl.example.jpa.model.User; import jakarta.inject.Inject; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UserRepositoryTest extends AbstractPersistenceTest { @Inject private UserRepository repository; diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt index 09e4807d9a..c654c8f693 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt +++ b/querydsl-examples/querydsl-example-kotlin-codegen/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt @@ -20,7 +20,7 @@ import com.querydsl.examples.kotlin.entity.ExampleEntity import com.querydsl.examples.kotlin.entity.QExampleEntity import com.querydsl.examples.kotlin.entity.QExampleEntity.Companion.exampleEntity import com.querydsl.jpa.impl.JPAQuery -import org.junit.Test +import org.junit.jupiter.api.Test class ExampleEntityTest { diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt index dd8b5425a7..f66279fcf2 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt +++ b/querydsl-examples/querydsl-example-kotlin-jpa/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt @@ -20,7 +20,7 @@ import com.querydsl.examples.kotlin.entity.ExampleEntity import com.querydsl.examples.kotlin.entity.QExampleEntity import com.querydsl.examples.kotlin.entity.QExampleEntity.exampleEntity import com.querydsl.jpa.impl.JPAQuery -import org.junit.Test +import org.junit.jupiter.api.Test class ExampleEntityTest { diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt b/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt index 2ea4c8d7a4..46417e3a76 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/src/test/kotlin/com/querydsl/examples/kotlin/ExampleEntityTest.kt @@ -17,7 +17,7 @@ package com.querydsl.examples.kotlin import com.querydsl.examples.kotlin.entity.QExampleEntity -import org.junit.Test +import org.junit.jupiter.api.Test class ExampleEntityTest { diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java index df3ac225d3..ee9628dbe7 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java @@ -2,25 +2,25 @@ import com.querydsl.example.config.TestConfiguration; import com.querydsl.example.config.TestDataService; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) public abstract class AbstractDaoTest { @Autowired TestDataService testDataService; - @Before + @BeforeEach public void setUp() { testDataService.addTestData(); } - @After + @AfterEach public void tearDown() throws Exception { testDataService.removeTestData(); } diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java index d808e99e89..090340d4a1 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java @@ -1,7 +1,7 @@ package com.querydsl.example.dao; import com.querydsl.example.dto.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java index 0e85d9db14..17c562962c 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/OrderDaoTest.java @@ -4,7 +4,7 @@ import com.querydsl.example.dto.Order; import com.querydsl.example.dto.OrderProduct; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java index 509353270a..c87b5c82bf 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/PersonDaoTest.java @@ -1,7 +1,7 @@ package com.querydsl.example.dao; import com.querydsl.example.dto.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java index d1357028bf..4da9afa6e9 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/ProductDaoTest.java @@ -3,7 +3,7 @@ import com.querydsl.example.dto.Product; import com.querydsl.example.dto.ProductL10n; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java index 8425ab7fcc..093c37e4c8 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java @@ -1,7 +1,7 @@ package com.querydsl.example.dao; import com.querydsl.example.dto.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java index b8063b1ded..7cf2714592 100644 --- a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java +++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/ConnectionContextTest.java @@ -3,16 +3,16 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.inject.Inject; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(GuiceTestRunner.class) +@ExtendWith(GuiceTestExtension.class) public class ConnectionContextTest { @Inject private ConnectionContext context; - @After + @AfterEach public void tearDown() { context.removeConnection(); } diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestExtension.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestExtension.java new file mode 100644 index 0000000000..21272fafaa --- /dev/null +++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestExtension.java @@ -0,0 +1,19 @@ +package com.querydsl.example.sql.guice; + +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstanceFactory; +import org.junit.jupiter.api.extension.TestInstanceFactoryContext; + +/** JUnit 5 replacement for the former {@code GuiceTestRunner}: builds test instances via Guice. */ +public class GuiceTestExtension implements TestInstanceFactory { + + private static final Injector injector = Guice.createInjector(new ServiceModule()); + + @Override + public Object createTestInstance( + TestInstanceFactoryContext factoryContext, ExtensionContext extensionContext) { + return injector.getInstance(factoryContext.getTestClass()); + } +} diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java deleted file mode 100644 index 2bff970828..0000000000 --- a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/guice/GuiceTestRunner.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.querydsl.example.sql.guice; - -import com.google.inject.Guice; -import com.google.inject.Injector; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.InitializationError; - -public class GuiceTestRunner extends BlockJUnit4ClassRunner { - - private static final Injector injector = Guice.createInjector(new ServiceModule()); - - public GuiceTestRunner(Class klass) throws InitializationError { - super(klass); - } - - @Override - protected Object createTest() throws Exception { - return injector.getInstance(getTestClass().getJavaClass()); - } -} diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java index 28eaefb79e..c4c54c9a19 100644 --- a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java +++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/AbstractPersistenceTest.java @@ -1,20 +1,20 @@ package com.querydsl.example.sql.repository; -import com.querydsl.example.sql.guice.GuiceTestRunner; +import com.querydsl.example.sql.guice.GuiceTestExtension; import com.querydsl.example.sql.guice.Transactional; import jakarta.inject.Inject; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import javax.sql.DataSource; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(GuiceTestRunner.class) +@ExtendWith(GuiceTestExtension.class) public abstract class AbstractPersistenceTest { @Inject private DataSource dataSource; - @Before + @BeforeEach @Transactional public void before() { try (var connection = dataSource.getConnection()) { diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java index c107c712a4..4f7acc62c9 100644 --- a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java +++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/TweetRepositoryTest.java @@ -6,8 +6,8 @@ import com.querydsl.example.sql.model.Tweet; import com.querydsl.example.sql.model.Usert; import jakarta.inject.Inject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class TweetRepositoryTest extends AbstractPersistenceTest { @Inject private TweetRepository repository; @@ -16,7 +16,7 @@ public class TweetRepositoryTest extends AbstractPersistenceTest { private Long posterId; - @Before + @BeforeEach public void setUp() { var poster = new Usert(); poster.setUsername("dr_frank"); diff --git a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java index 44207b5c74..65277a4da2 100644 --- a/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java +++ b/querydsl-examples/querydsl-example-sql-guice/src/test/java/com/querydsl/example/sql/repository/UserRepositoryTest.java @@ -5,7 +5,7 @@ import com.querydsl.example.sql.model.Tweet; import com.querydsl.example.sql.model.Usert; import jakarta.inject.Inject; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UserRepositoryTest extends AbstractPersistenceTest { @Inject private UserRepository repository; diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java index 427cdba9d2..cb33ec4e27 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/AbstractDaoTest.java @@ -2,15 +2,15 @@ import com.querydsl.example.config.TestConfiguration; import com.querydsl.example.config.TestDataService; -import org.junit.Before; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestConfiguration.class}) @Rollback @Transactional @@ -18,7 +18,7 @@ public abstract class AbstractDaoTest { @Autowired TestDataService testDataService; - @Before + @BeforeEach public void setUp() { testDataService.addTestData(); } diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java index 6f4115b9d0..048a2830b8 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/CustomerDaoTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; public class CustomerDaoTest extends AbstractDaoTest { diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java index 2ded404db4..fa711fe57a 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/OrderDaoTest.java @@ -6,7 +6,7 @@ import com.querydsl.example.dto.Order; import com.querydsl.example.dto.OrderProduct; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; public class OrderDaoTest extends AbstractDaoTest { diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java index 2a262291bb..6377ac587b 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/PersonDaoTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.example.dto.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; public class PersonDaoTest extends AbstractDaoTest { diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java index a1fb530474..5f149323c8 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/ProductDaoTest.java @@ -5,7 +5,7 @@ import com.querydsl.example.dto.Product; import com.querydsl.example.dto.ProductL10n; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; public class ProductDaoTest extends AbstractDaoTest { diff --git a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java index c26bf36ac1..b67c50421b 100644 --- a/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java +++ b/querydsl-examples/querydsl-example-sql-spring/src/test/java/com/querydsl/example/dao/SupplierDaoTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.example.dto.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; public class SupplierDaoTest extends AbstractDaoTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java index ee37b30de6..27e68957ba 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AbstractQueryTest.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractQueryTest { @@ -50,7 +50,7 @@ public abstract class AbstractQueryTest { protected TestQuery last; - @Before + @BeforeEach public void setUp() { myInts.addAll(Arrays.asList(1, 2, 3, 4)); Alias.resetAlias(); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java index 4b3a085ac8..0131aa7eb1 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AggregationTest.java @@ -1,11 +1,12 @@ package com.querydsl.collections; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.within; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AggregationTest extends AbstractQueryTest { @@ -14,7 +15,7 @@ public class AggregationTest extends AbstractQueryTest { private CollQuery query; @Override - @Before + @BeforeEach public void setUp() { var cat1 = new Cat(); cat1.setWeight(2); @@ -53,9 +54,10 @@ public void min() { } @SuppressWarnings("unchecked") - @Test(expected = UnsupportedOperationException.class) + @Test public void min_and_max() { - query.select(cat.weight.min(), cat.weight.max()).fetchOne(); + assertThatThrownBy(() -> query.select(cat.weight.min(), cat.weight.max()).fetchOne()) + .isInstanceOf(UnsupportedOperationException.class); } @Test diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java index 8fa71f924b..9c0754fa98 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AliasTest.java @@ -26,13 +26,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AliasTest extends AbstractQueryTest { @Override - @Before + @BeforeEach public void setUp() { myInts.add(1); myInts.add(2); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java index 31557da1f4..85244caab5 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/AnimalTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.SimplePath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnimalTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java index a3b959f4f1..bac20fc055 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BigDecimalTest.java @@ -6,7 +6,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.math.BigDecimal; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BigDecimalTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java index 63683a4311..cb6cc4f166 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/BooleanTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.alias.Alias; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BooleanTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java index 09afc6158b..fc6fed95c7 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CastTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CastTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java index aecd1cac5e..8814332580 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CatTest.java @@ -14,15 +14,17 @@ package com.querydsl.collections; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.types.dsl.SimplePath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CatTest { - @Test(expected = NoSuchFieldException.class) - public void skippedField() throws SecurityException, NoSuchFieldException { - QCat.class.getField("skippedField"); + @Test + public void skippedField() { + assertThatThrownBy(() -> QCat.class.getField("skippedField")) + .isInstanceOf(NoSuchFieldException.class); } @Test diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java index 20e9fcc190..ed5d79b4ab 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollDeleteClauseTest.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollDeleteClauseTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java index 791f530810..bc7c27ff68 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryFunctionsTest.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class CollQueryFunctionsTest { @@ -28,7 +28,7 @@ public void coalesce() { } @Test - @Ignore + @Disabled public void likeSpeed() { // 3015 final var iterations = 1000000; diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java index 7d50ec135e..4314225720 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryStandardTest.java @@ -14,6 +14,7 @@ package com.querydsl.collections; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.Fetchable; import com.querydsl.core.QueryExecution; @@ -31,7 +32,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollQueryStandardTest { @@ -183,12 +184,16 @@ public void params_anon() { .isEqualTo("Bob"); } - @Test(expected = ParamNotSetException.class) + @Test public void params_not_set() { var name = new Param<>(String.class, "name"); - assertThat( - CollQueryFactory.from(cat, data).where(cat.name.eq(name)).select(cat.name).fetchOne()) - .isEqualTo("Bob"); + assertThatThrownBy( + () -> + CollQueryFactory.from(cat, data) + .where(cat.name.eq(name)) + .select(cat.name) + .fetchOne()) + .isInstanceOf(ParamNotSetException.class); } @Test diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java index 1b0e4974ba..8c0459e0b7 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTemplatesTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.TemplatesTestUtils; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollQueryTemplatesTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java index ee8c181dc8..67507b2322 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollQueryTest.java @@ -15,6 +15,7 @@ import static com.querydsl.collections.CollQueryFactory.from; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.Tuple; import com.querydsl.core.types.Expression; @@ -26,7 +27,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollQueryTest extends AbstractQueryTest { @@ -178,13 +179,15 @@ public void bigDecimals() { assertThat(nums).isEqualTo(Arrays.asList(new BigDecimal("2.1"), new BigDecimal("20.21"))); } - @Test(expected = UnsupportedOperationException.class) + @Test public void groupBy() { - query().from(cat, cats).groupBy(cat.name); + assertThatThrownBy(() -> query().from(cat, cats).groupBy(cat.name)) + .isInstanceOf(UnsupportedOperationException.class); } - @Test(expected = UnsupportedOperationException.class) + @Test public void having() { - query().from(cat, cats).having(cat.name.isNull()); + assertThatThrownBy(() -> query().from(cat, cats).having(cat.name.isNull())) + .isInstanceOf(UnsupportedOperationException.class); } } diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java index 0072fa71e6..5414f4b5e8 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollUpdateClauseTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollUpdateClauseTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java index 48a52bff4a..fb949287f1 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionAnyTest.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollectionAnyTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java index a9dc110dce..97752c5d60 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CollectionTest.java @@ -18,8 +18,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CollectionTest { @@ -29,7 +29,7 @@ public class CollectionTest { private List cats; - @Before + @BeforeEach public void setUp() { var cat1 = new Cat("1"); cat1.setKittens(Collections.singletonList(cat1)); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java index f7beafb111..46662054ad 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/CompilationOverheadTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompilationOverheadTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java index c3aad1b75b..5dcc700df9 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DistinctTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DistinctTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java index 7725ba2e9d..08b54ebe1c 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DocumentTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Predicate; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DocumentTest { @@ -12,7 +12,7 @@ public class DocumentTest { private QDocument qDoc = QDocument.document; - @Before + @BeforeEach public void setUp() { doc1 = new Document(); doc1.setId(1L); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java index 8d8506abf4..69951d70db 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/ECJEvaluatorFactoryTest.java @@ -1,7 +1,7 @@ package com.querydsl.collections; import com.querydsl.codegen.utils.ECJEvaluatorFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ECJEvaluatorFactoryTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java index 4307a2166b..c58ee34f8b 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EntityWithLongIdTest.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EntityWithLongIdTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java index 291190b88d..80d8aeb0bc 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/EvaluatorTransformerTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.QueryMetadata; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EvaluatorTransformerTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java index 6c8d09c2e0..3aa00adcd2 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FirstResultContractTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FirstResultContractTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java index 3c65686c8f..c96318184d 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/FunctionalHelpersTest.java @@ -4,7 +4,7 @@ import java.util.function.Function; import java.util.function.Predicate; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FunctionalHelpersTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java index 718da8a71c..cbcfa493f9 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy2Test.java @@ -11,8 +11,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class GroupBy2Test { @@ -74,7 +74,7 @@ public UserDto(Long id, String name, Map roles, Map private List users; - @Before + @BeforeEach public void setUp() { var r1 = new Role(); r1.id = 1L; diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java index 6abc6fd6f4..cc28d9ff6b 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy3Test.java @@ -14,7 +14,7 @@ import com.querydsl.core.types.Projections; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GroupBy3Test { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java index be8e61989e..c839a8cec3 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupBy4Test.java @@ -34,7 +34,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GroupBy4Test { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java index dd043e3cd7..7850e9cdae 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/GroupByTest.java @@ -22,6 +22,7 @@ import static com.querydsl.core.group.GroupBy.set; import static com.querydsl.core.group.GroupBy.sum; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.group.Group; import com.querydsl.core.types.ConstructorExpression; @@ -32,8 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class GroupByTest { @@ -155,7 +156,7 @@ public void first_set_and_list() { } @Test - @Ignore + @Disabled public void group_by_null() { Map results = CollQueryFactory.from(post, posts) @@ -179,20 +180,25 @@ public void group_by_null() { // group.getSet(qComment); // } - @Test(expected = ClassCastException.class) + @Test public void classCastException() { - Map results = - CollQueryFactory.from(post, posts) - .from(comment, comments) - .where(comment.post.id.eq(post.id)) - .transform(groupBy(post.id).as(post.name, set(comment.id), list(comment.text))); - - var group = results.get(1); - group.getList(comment.id); + assertThatThrownBy( + () -> { + Map results = + CollQueryFactory.from(post, posts) + .from(comment, comments) + .where(comment.post.id.eq(post.id)) + .transform( + groupBy(post.id).as(post.name, set(comment.id), list(comment.text))); + + var group = results.get(1); + group.getList(comment.id); + }) + .isInstanceOf(ClassCastException.class); } @Test - @Ignore + @Disabled public void map_() { Map results = CollQueryFactory.from(post, posts) diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java index be9d86e0ec..a3185075cd 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerClassTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InnerClassTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java index 88980f2930..d7257106dd 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/InnerJoinTest.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class InnerJoinTest extends AbstractQueryTest { @@ -30,7 +30,7 @@ public class InnerJoinTest extends AbstractQueryTest { private List cats; @Override - @Before + @BeforeEach public void setUp() { super.setUp(); cat = new QCat("c"); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java index 51f632d973..dd04ae07e6 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/IterationTest.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IterationTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JSR310TimeTemplatesTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JSR310TimeTemplatesTest.java index 365587b56f..cc29693927 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JSR310TimeTemplatesTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JSR310TimeTemplatesTest.java @@ -9,7 +9,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310TimeTemplatesTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java index 7568a39fd8..f3380a71d0 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/JacocoTest.java @@ -6,7 +6,7 @@ import com.querydsl.core.types.dsl.EntityPathBase; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JacocoTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java index b871939e74..0ae3740f57 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LeftJoinTest.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class LeftJoinTest extends AbstractQueryTest { @@ -30,7 +30,7 @@ public class LeftJoinTest extends AbstractQueryTest { private List cats; @Override - @Before + @BeforeEach public void setUp() { super.setUp(); cat = new QCat("c"); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java index 82be73c631..7de063d795 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/LoadTest.java @@ -17,15 +17,14 @@ import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.QueryMetadata; -import com.querydsl.core.testutil.Performance; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(Performance.class) +@Tag("com.querydsl.core.testutil.Performance") public class LoadTest { private QCat cat = QCat.cat; diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java index 746a0185fe..94e997ff00 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MappingProjectionTest.java @@ -4,7 +4,7 @@ import com.querydsl.core.Tuple; import com.querydsl.core.types.MappingProjection; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("serial") public class MappingProjectionTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java index d168f25c37..90d28bac1c 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MathTest.java @@ -8,7 +8,7 @@ import com.querydsl.core.types.dsl.MathExpressions; import com.querydsl.core.types.dsl.NumberPath; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MathTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java index 08964d1e1b..f8dd325bc1 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MockTest.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.List; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MockTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java index 2545c677dc..0c3670dcd2 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/MultiComparatorTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.codegen.utils.Evaluator; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MultiComparatorTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java index 4987819a77..f9bab34648 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NullSafetyTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NullSafetyTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java index 6397e7ced7..e4e21d1f51 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/NumberTest.java @@ -6,7 +6,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.math.BigDecimal; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NumberTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java index f778c4adf6..adf40fb626 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/OrderTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OrderTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java index 44f11d203c..65a4ed3261 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PagingTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PagingTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java index e4e77be219..746a762851 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PathComparatorTest.java @@ -4,14 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Comparator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class PathComparatorTest { private Comparator comparator; - @Before + @BeforeEach public void setUpComparator() { comparator = pathComparator(QCar.car.horsePower); } diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java index c9a689d526..fa3055395a 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PatternsTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PatternsTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java index 5520ed5bbc..0a69829b79 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/PropertiesTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PropertiesTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java index aabc6ac143..26244978af 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMetadataTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.JoinType; import com.querydsl.core.QueryMetadata; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryMetadataTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java index 8602fcf200..96a15ba008 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryMutabilityTest.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryMutabilityTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java index 061bb28da4..d43ff75931 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/QueryPerformanceTest.java @@ -1,15 +1,14 @@ package com.querydsl.collections; -import com.querydsl.core.testutil.Performance; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; @@ -18,15 +17,15 @@ import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; -@Ignore -@Category(Performance.class) +@Disabled +@Tag("com.querydsl.core.testutil.Performance") public class QueryPerformanceTest { private static final int size = 1000; private static List cats = new ArrayList<>(size); - @BeforeClass + @BeforeAll public static void setUpClass() throws SQLException, ClassNotFoundException { for (var i = 0; i < size; i++) { cats.add(new Cat(String.valueOf(i), i)); diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java index acbd465ffc..f20b8e5eae 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/SerializationTest.java @@ -18,8 +18,8 @@ import com.querydsl.core.types.QTuple; import java.util.ArrayList; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class SerializationTest extends AbstractQueryTest { @@ -105,7 +105,7 @@ public String oneSource_filtered_projectedUnique(List cats) { } @Test - @Ignore + @Disabled public void join_list() { query() .from(cat, cats) diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java index cfc96468e4..39a77635ab 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/StringHandlingTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.dsl.StringPath; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StringHandlingTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java index aa2b2f30ed..c1651259bf 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/TypeCastTest.java @@ -13,19 +13,25 @@ */ package com.querydsl.collections; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.querydsl.core.types.dsl.PathInits; import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class TypeCastTest { - @Test(expected = IllegalStateException.class) - @Ignore + @Test + @Disabled public void cast() { - var animal = QAnimal.animal; - var cat = new QCat(animal.getMetadata(), new PathInits("*")); - CollQueryFactory.from(animal, Collections.emptyList()) - .from(cat, Collections.emptyList()); + assertThatThrownBy( + () -> { + var animal = QAnimal.animal; + var cat = new QCat(animal.getMetadata(), new PathInits("*")); + CollQueryFactory.from(animal, Collections.emptyList()) + .from(cat, Collections.emptyList()); + }) + .isInstanceOf(IllegalStateException.class); } } diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java index adc1426da1..af4a7c4457 100644 --- a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/UniqueResultContractTest.java @@ -13,15 +13,19 @@ */ package com.querydsl.collections; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.querydsl.core.NonUniqueResultException; import com.querydsl.core.types.Expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UniqueResultContractTest extends AbstractQueryTest { - @Test(expected = NonUniqueResultException.class) + @Test public void unique_result_throws_exception_on_multiple_results() { - CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).fetchOne(); + assertThatThrownBy( + () -> CollQueryFactory.from(cat, cats).where(cat.name.isNotNull()).fetchOne()) + .isInstanceOf(NonUniqueResultException.class); } @Test diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java index 3060a30e1c..00155e6a9d 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java @@ -103,6 +103,7 @@ public Collection date( && !target.equals(Target.MYSQL) && !target.equals(Target.CUBRID) && !target.equals(Target.POSTGRESQL) + && !target.equals(Target.H2) && !target.equals(Target.HSQLDB)) { rv.add(expr.week().eq(other.week())); } @@ -142,6 +143,7 @@ public Collection dateTime( && !target.equals(Target.MYSQL) && !target.equals(Target.CUBRID) && !target.equals(Target.POSTGRESQL) + && !target.equals(Target.H2) && !target.equals(Target.HSQLDB)) { rv.add(expr.week().eq(other.week())); } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java index 72ddc2d142..b0c244e052 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TemplatesTestBase.java @@ -15,22 +15,17 @@ */ package com.querydsl.core; -import static org.assertj.core.api.Assertions.assertThat; - import com.querydsl.core.types.Templates; import io.github.classgraph.ClassGraph; import java.util.Set; import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.junit.Rule; +import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; -import org.junit.rules.ErrorCollector; public class TemplatesTestBase { - @Rule public final ErrorCollector errorCollector = new ErrorCollector(); - private final ClassGraph querydsl = new ClassGraph() .enableClassInfo() @@ -44,14 +39,16 @@ void default_instance() { Set> moduleSpecific = templates.stream().filter(MODULE_SPECIFIC).collect(Collectors.toSet()); + var softly = new SoftAssertions(); for (Class template : moduleSpecific) { try { var defaultInstance = (Templates) template.getField("DEFAULT").get(null); - errorCollector.checkSucceeds(() -> assertThat(defaultInstance).isInstanceOf(template)); + softly.assertThat(defaultInstance).isInstanceOf(template); } catch (Exception ex) { - errorCollector.addError(ex); + softly.fail("Failed to read DEFAULT of " + template.getName(), ex); } } + softly.assertAll(); } private final Predicate> objectPredicate = diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java deleted file mode 100644 index f15b4d0564..0000000000 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/EmptyStatement.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.querydsl.core.testutil; - -import org.junit.runners.model.Statement; - -public final class EmptyStatement extends Statement { - - public static final Statement DEFAULT = new EmptyStatement(); - - private EmptyStatement() {} - - @Override - public void evaluate() throws Throwable {} -} diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java deleted file mode 100644 index 2414bafd07..0000000000 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Parallelized.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.querydsl.core.testutil; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import org.junit.runners.Parameterized; -import org.junit.runners.model.RunnerScheduler; - -public class Parallelized extends Parameterized { - - public Parallelized(Class klass) throws Throwable { - super(klass); - setScheduler(new ThreadPoolScheduler()); - } - - private static class ThreadPoolScheduler implements RunnerScheduler { - private ExecutorService executor; - - ThreadPoolScheduler() { - var numThreads = Runtime.getRuntime().availableProcessors(); - executor = Executors.newFixedThreadPool(numThreads); - } - - @Override - public void finished() { - executor.shutdown(); - try { - executor.awaitTermination(10, TimeUnit.MINUTES); - } catch (InterruptedException exc) { - throw new RuntimeException(exc); - } - } - - @Override - public void schedule(Runnable childStatement) { - executor.submit(childStatement); - } - } -} diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java deleted file mode 100644 index 1b1db1af60..0000000000 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/TravisFoldListener.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.querydsl.core.testutil; - -import org.junit.runner.Description; -import org.junit.runner.Result; -import org.junit.runner.notification.RunListener; - -/** - * @author Shredder121 - */ -public class TravisFoldListener extends RunListener { - - private static final long ID = System.currentTimeMillis(); - - @Override - public void testRunStarted(Description description) throws Exception { - IO.println("travis_fold:start:tests" + ID); - IO.println("Running tests"); - } - - @Override - public void testRunFinished(Result result) throws Exception { - IO.println("travis_fold:end:tests" + ID); - } -} diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java index 29bbea4cc7..dc399e9adb 100644 --- a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java +++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/DialectSupport.java @@ -70,9 +70,7 @@ public static void extendRegistry( var basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry(); functions.forEach( - (name, template) -> - functionRegistry.registerPattern( - name, template.pattern(), basicTypeRegistry.resolve(template.type()))); + (name, template) -> registerPattern(functionRegistry, basicTypeRegistry, name, template)); } public static void extendRegistry( @@ -82,8 +80,23 @@ public static void extendRegistry( var functionRegistry = functionContributions.getFunctionRegistry(); var basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry(); - functionRegistry.registerPattern( - name, template.pattern(), basicTypeRegistry.resolve(template.type())); + registerPattern(functionRegistry, basicTypeRegistry, name, template); + } + + private static void registerPattern( + org.hibernate.query.sqm.function.SqmFunctionRegistry functionRegistry, + org.hibernate.type.BasicTypeRegistry basicTypeRegistry, + String name, + DialectFunctionTemplate template) { + // Operators such as CURRENT_DATE are declared with a generic Comparable type that does not map + // to a Hibernate BasicType. In that case register the pattern without an explicit return type + // and let Hibernate infer it, instead of failing on a null type. + if (template.type() == null) { + functionRegistry.registerPattern(name, template.pattern()); + } else { + functionRegistry.registerPattern( + name, template.pattern(), basicTypeRegistry.resolve(template.type())); + } } static class DialectFunctionTemplate { diff --git a/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServerDialect.java b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServerDialect.java new file mode 100644 index 0000000000..aebcf76e77 --- /dev/null +++ b/querydsl-libraries/querydsl-jpa/src/main/java/com/querydsl/jpa/support/QSQLServerDialect.java @@ -0,0 +1,33 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.jpa.support; + +import com.querydsl.core.types.Ops; +import com.querydsl.sql.SQLServer2012Templates; +import org.hibernate.boot.model.FunctionContributions; +import org.hibernate.dialect.SQLServerDialect; + +/** {@code QSQLServerDialect} extends {@code SQLServerDialect} with additional functions */ +public class QSQLServerDialect extends SQLServerDialect { + + @Override + public void initializeFunctionRegistry(FunctionContributions functionContributions) { + super.initializeFunctionRegistry(functionContributions); + DialectSupport.extendRegistry(SQLServer2012Templates.DEFAULT, functionContributions); + DialectSupport.extendRegistry( + "current_date", + DialectSupport.createFunction(SQLServer2012Templates.DEFAULT, Ops.DateTimeOps.CURRENT_DATE), + functionContributions); + } +} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/PackagelessEntityTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/PackagelessEntityTest.java index dfcfd9e82e..b3c4688734 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/PackagelessEntityTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/PackagelessEntityTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.PathBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PackagelessEntityTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java index fe0f91863d..acff72aa49 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java @@ -22,6 +22,7 @@ import static com.querydsl.core.Target.TERADATA; import static com.querydsl.jpa.JPAExpressions.select; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.within; import com.querydsl.core.Fetchable; @@ -111,9 +112,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author tiwe @@ -166,7 +167,7 @@ protected Target getTarget() { protected abstract void save(Object entity); - @Before + @BeforeEach public void setUp() { if (query().from(cat).fetchCount() > 0) { savedCats.addAll(query().from(cat).orderBy(cat.id.asc()).select(cat).fetch()); @@ -1128,7 +1129,7 @@ public void groupBy_yearMonth() { } @Test - @Ignore // FIXME + @Disabled // FIXME public void groupBy_count() { var ids = query().from(cat).groupBy(cat.id).select(cat.id).fetch(); var count = query().from(cat).groupBy(cat.id).fetchCount(); @@ -1142,7 +1143,7 @@ public void groupBy_count() { } @Test - @Ignore // FIXME + @Disabled // FIXME public void groupBy_distinct_count() { var ids = query().from(cat).groupBy(cat.id).distinct().select(Expressions.ONE).fetch(); var results = @@ -1227,7 +1228,7 @@ public void in5() { } @Test - @Ignore + @Disabled public void in6() { // query().from(cat).where(cat.kittens.in(savedCats)).fetchCount(); } @@ -1489,7 +1490,7 @@ public void map_groupBy() { } @Test - @Ignore + @Disabled public void map_join() { // select m.text from Show s join s.acts a where key(a) = 'B' var show = QShow.show; @@ -1736,11 +1737,15 @@ public void params_anon() { .isEqualTo("Bob123"); } - @Test(expected = ParamNotSetException.class) + @Test public void params_not_set() { - var name = new Param<>(String.class, "name"); - assertThat(query().from(cat).where(cat.name.eq(name)).select(cat.name).fetchFirst()) - .isEqualTo("Bob123"); + assertThatThrownBy( + () -> { + var name = new Param<>(String.class, "name"); + assertThat(query().from(cat).where(cat.name.eq(name)).select(cat.name).fetchFirst()) + .isEqualTo("Bob123"); + }) + .isInstanceOf(ParamNotSetException.class); } @Test @@ -1773,7 +1778,7 @@ public void factoryExpression_in_groupBy() { } @Test - @Ignore + @Disabled public void size() { // NOT SUPPORTED query().from(cat).select(cat, cat.kittens.size()).fetch(); @@ -1911,7 +1916,7 @@ public void substring2() { } @Test - @Ignore // FIXME + @Disabled // FIXME @ExcludeIn(DERBY) public void substring_from_right() { assertThat( @@ -1958,14 +1963,14 @@ public void subtract_bigDecimal() { } @Test - @Ignore + @Disabled public void sum() { // NOT SUPPORTED query().from(cat).select(cat.kittens.size().sumLong()).fetch(); } @Test - @Ignore + @Disabled public void sum_2() { // NOT SUPPORTED query().from(cat).where(cat.kittens.size().sumLong().gt(0)).select(cat).fetch(); @@ -2231,7 +2236,7 @@ public void treat() { } @Test - @Ignore + @Disabled public void type() { assertThat( query() diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java index 396ff78b63..3b3e6e0004 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class AbstractSQLTest { @@ -65,7 +65,7 @@ public void enum_binding() { } @Test - @Ignore + @Disabled public void entityProjections() { var cats = query() @@ -283,7 +283,11 @@ public void list_with_offset() { @Test @ExcludeIn(Target.HSQLDB) public void no_from() { - assertThat(query().select(DateExpression.currentDate()).fetchFirst()).isNotNull(); + // the result type of current_date depends on the JPA provider (Hibernate -> LocalDate, + // EclipseLink -> java.sql.Date), so project through a wildcard to avoid a provider-specific + // cast + DateExpression currentDate = DateExpression.currentDate(); + assertThat(query().select(currentDate).fetchFirst()).isNotNull(); } @Test @@ -349,7 +353,7 @@ public void union_all() { @SuppressWarnings("unchecked") @Test @ExcludeIn({Target.DERBY, Target.POSTGRESQL}) - @Ignore // FIXME + @Disabled // FIXME public void union2() { var rows = query() @@ -367,7 +371,7 @@ public void union2() { @SuppressWarnings("unchecked") @Test @ExcludeIn(Target.DERBY) - @Ignore // FIXME + @Disabled // FIXME public void union3() { var cat2 = new SAnimal_("cat2"); var rows = @@ -391,7 +395,7 @@ public void union3() { @SuppressWarnings("unchecked") @Test @ExcludeIn({Target.DERBY, Target.POSTGRESQL}) - @Ignore // FIXME + @Disabled // FIXME public void union4() { query() .union( diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java index 97f3227b72..b03e939023 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/AggregationTest.java @@ -15,7 +15,7 @@ import static com.querydsl.jpa.Constants.cat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AggregationTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java index 6f2a49df9e..3865e01a78 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/BooleanOperationsTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.BooleanBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BooleanOperationsTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java index c20bc82fec..6f431a1f47 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CastTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CastTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java index 35a711a9a0..1caf1126f6 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CollectionTest.java @@ -17,7 +17,7 @@ import static com.querydsl.jpa.Constants.cat1; import com.querydsl.jpa.domain.Cat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollectionTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java index 3fb6705b4f..e44cb5971a 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ComparableTest.java @@ -16,7 +16,7 @@ import static com.querydsl.jpa.Constants.cat; import static com.querydsl.jpa.Constants.kitten; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ComparableTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java index 8cb7e8c2d6..bf2622710a 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ConstructorsTest.java @@ -18,8 +18,8 @@ import com.querydsl.core.types.ConstructorExpression; import com.querydsl.core.types.Expression; import com.querydsl.core.types.Projections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ConstructorsTest extends AbstractQueryTest { @@ -35,7 +35,7 @@ public QBookmarkDTO(Expression address) { } @Test - @Ignore + @Disabled public void constructors() { ConstructorExpression c = Projections.constructor( diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java index d6de837793..c04d1613f7 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/CustomExpressionsTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.TemplateFactory; import com.querydsl.core.types.dsl.StringTemplate; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CustomExpressionsTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java index 61fe87fe36..6cec36791b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DateTimeTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.TimeExpression; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DateTimeTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java index f8cfbdfa96..e18f222a6b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/DependenciesTest.java @@ -17,7 +17,7 @@ import java.io.IOException; import jdepend.framework.JDepend; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DependenciesTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java index 49339f468b..a3f7b208b6 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/EJBQLTest.java @@ -15,7 +15,7 @@ import static com.querydsl.jpa.Constants.cat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EJBQLTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java index 5688864360..1c6305217d 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ExpressionSerializationTest.java @@ -7,7 +7,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.jpa.domain.QCat; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExpressionSerializationTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java index 95400fce5e..61714e6817 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/FeaturesTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.jpa.domain.QAccount; import com.querydsl.jpa.domain.QInheritedProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FeaturesTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java index 37baceaaa7..5d3bf015ad 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateBase.java @@ -32,29 +32,22 @@ import com.querydsl.jpa.hibernate.DefaultSessionHolder; import com.querydsl.jpa.hibernate.HibernateDeleteClause; import com.querydsl.jpa.hibernate.HibernateQuery; -import com.querydsl.jpa.testutil.HibernateTestRunner; +import com.querydsl.jpa.testutil.HibernateTestExtension; import java.io.IOException; import java.util.List; import org.hibernate.LockMode; import org.hibernate.Session; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * @author tiwe */ -@RunWith(HibernateTestRunner.class) +@ExtendWith({HibernateTestExtension.class, TargetExtension.class, JPAProviderExtension.class}) public class HibernateBase extends AbstractJPATest implements HibernateTest { private static final QCat cat = QCat.cat; - @Rule @ClassRule public static TestRule jpaProviderRule = new JPAProviderRule(); - - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - private Session session; @Override diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java index 07d01fffec..0cab9b12cf 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateExecuteWithKeyTest.java @@ -25,11 +25,11 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class HibernateExecuteWithKeyTest { @@ -37,7 +37,7 @@ public class HibernateExecuteWithKeyTest { private Session session; private Transaction tx; - @BeforeClass + @BeforeAll public static void setUpClass() { var cfg = new Configuration(); cfg.addAnnotatedClass(GeneratedKeyEntity.class); @@ -50,20 +50,20 @@ public static void setUpClass() { sessionFactory = cfg.buildSessionFactory(); } - @AfterClass + @AfterAll public static void tearDownClass() { if (sessionFactory != null) { sessionFactory.close(); } } - @Before + @BeforeEach public void setUp() { session = sessionFactory.openSession(); tx = session.beginTransaction(); } - @After + @AfterEach public void tearDown() { if (tx != null && tx.isActive()) { tx.rollback(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java index 503429e745..1d70f859ae 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateHandlerTest.java @@ -1,6 +1,7 @@ package com.querydsl.jpa; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -20,7 +21,7 @@ import org.hibernate.query.NativeQuery; import org.hibernate.query.spi.ScrollableResultsImplementor; import org.hibernate.transform.ResultTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HibernateHandlerTest { @@ -40,19 +41,23 @@ public void should_add_entity() { verify(nativeQuery); } - @Test(expected = PersistenceException.class) + @Test public void addEntity_should_throw_persistence_exception_when_invalid_query_type() { - var notSupportedQuery = (Query) createMock(EJBQueryImpl.class); - var expectedThrow = - new PersistenceException( - ExceptionLocalization.buildMessage( - "unable_to_unwrap_jpa", - new String[] {Query.class.getName(), NativeQuery.class.getName()})); - - expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow); - replay(notSupportedQuery); - - hibernateHandler.addEntity(notSupportedQuery, alias, classType); + assertThatThrownBy( + () -> { + var notSupportedQuery = (Query) createMock(EJBQueryImpl.class); + var expectedThrow = + new PersistenceException( + ExceptionLocalization.buildMessage( + "unable_to_unwrap_jpa", + new String[] {Query.class.getName(), NativeQuery.class.getName()})); + + expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow); + replay(notSupportedQuery); + + hibernateHandler.addEntity(notSupportedQuery, alias, classType); + }) + .isInstanceOf(PersistenceException.class); } @Test @@ -66,19 +71,23 @@ public void should_add_scalar() { verify(nativeQuery); } - @Test(expected = PersistenceException.class) + @Test public void addScalar_should_throw_persistence_exception_when_invalid_query_type() { - var notSupportedQuery = (EJBQueryImpl) createMock(EJBQueryImpl.class); - var expectedThrow = - new PersistenceException( - ExceptionLocalization.buildMessage( - "unable_to_unwrap_jpa", - new String[] {Query.class.getName(), NativeQuery.class.getName()})); - - expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow); - replay(notSupportedQuery); - - hibernateHandler.addScalar(notSupportedQuery, alias, classType); + assertThatThrownBy( + () -> { + var notSupportedQuery = (EJBQueryImpl) createMock(EJBQueryImpl.class); + var expectedThrow = + new PersistenceException( + ExceptionLocalization.buildMessage( + "unable_to_unwrap_jpa", + new String[] {Query.class.getName(), NativeQuery.class.getName()})); + + expect(notSupportedQuery.unwrap(NativeQuery.class)).andThrow(expectedThrow); + replay(notSupportedQuery); + + hibernateHandler.addScalar(notSupportedQuery, alias, classType); + }) + .isInstanceOf(PersistenceException.class); } @Test diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java index 1686e6815d..f311b02655 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryFactoryTest.java @@ -20,14 +20,14 @@ import java.util.function.Supplier; import org.easymock.EasyMock; import org.hibernate.Session; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class HibernateQueryFactoryTest { private HibernateQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { Supplier provider = () -> EasyMock.createNiceMock(Session.class); queryFactory = new HibernateQueryFactory(JPQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java index 1d42353717..b5ef22f9cc 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryMutabilityTest.java @@ -18,16 +18,16 @@ import com.querydsl.core.QueryMutability; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.hibernate.HibernateQuery; -import com.querydsl.jpa.testutil.HibernateTestRunner; +import com.querydsl.jpa.testutil.HibernateTestExtension; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import org.hibernate.Session; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@Ignore -@RunWith(HibernateTestRunner.class) +@Disabled +@ExtendWith(HibernateTestExtension.class) public class HibernateQueryMutabilityTest implements HibernateTest { private Session session; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java index ad5b93e6a3..a8a8a2f17f 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateQueryTest.java @@ -20,7 +20,7 @@ import com.querydsl.jpa.domain.QEmployee; import com.querydsl.jpa.domain.QUser; import com.querydsl.jpa.hibernate.HibernateQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HibernateQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java index acae720222..27f79e566f 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java @@ -22,21 +22,16 @@ import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.domain.sql.SAnimal_; import com.querydsl.jpa.hibernate.sql.HibernateSQLQuery; -import com.querydsl.jpa.testutil.HibernateTestRunner; +import com.querydsl.jpa.testutil.HibernateTestExtension; import com.querydsl.sql.SQLTemplates; import org.hibernate.Session; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(HibernateTestRunner.class) +@ExtendWith({HibernateTestExtension.class, TargetExtension.class}) public class HibernateSQLBase extends AbstractSQLTest implements HibernateTest { - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - private final SQLTemplates templates = Mode.getSQLTemplates(); private final SAnimal_ cat = new SAnimal_("cat"); @@ -53,7 +48,7 @@ public void setSession(Session session) { this.session = session; } - @Before + @BeforeEach public void setUp() { if (query().from(cat).fetchCount() == 0) { session.persist(new Cat("Beck", 1, Color.BLACK)); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java index ec9c5b8cc7..69ac3070cb 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/IntegrationBase.java @@ -25,15 +25,15 @@ import com.querydsl.jpa.hibernate.HibernateQuery; import com.querydsl.jpa.hibernate.HibernateUpdateClause; import com.querydsl.jpa.hibernate.HibernateUtil; -import com.querydsl.jpa.testutil.HibernateTestRunner; +import com.querydsl.jpa.testutil.HibernateTestExtension; import java.util.Arrays; import java.util.List; import org.hibernate.ScrollMode; import org.hibernate.Session; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(HibernateTestRunner.class) +@ExtendWith(HibernateTestExtension.class) public class IntegrationBase extends ParsingTest implements HibernateTest { private Session session; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java index 1cb77eec6c..edcd01d098 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPABase.java @@ -34,7 +34,7 @@ import com.querydsl.jpa.domain.QParent; import com.querydsl.jpa.impl.JPADeleteClause; import com.querydsl.jpa.impl.JPAQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; import jakarta.persistence.LockModeType; @@ -42,25 +42,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * @author tiwe */ -@RunWith(JPATestRunner.class) +@ExtendWith({JPATestExtension.class, TargetExtension.class, JPAProviderExtension.class}) public class JPABase extends AbstractJPATest implements JPATest { private static final QCat cat = QCat.cat; - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - - @Rule @ClassRule public static TestRule jpaProviderRule = new JPAProviderRule(); - private EntityManager entityManager; @Override @@ -97,7 +90,7 @@ public void connection_access() { } @Test - @Ignore + @Disabled public void delete() { delete(cat).execute(); } @@ -135,6 +128,9 @@ public void delete_where_subQuery_exists() { @Test @NoBatooJPA + // Hibernate wraps the correlated EXISTS subquery in a derived table, and MySQL cannot reference + // the deleted table's alias from inside a derived table ("Unknown column 'c1_0.parent_id'") + @ExcludeIn(Target.MYSQL) public void delete_where_subQuery2() { var child = QChild.child; var parent = QParent.parent; @@ -213,6 +209,9 @@ public void limit1_uniqueResult() { } @Test + // Hibernate 7.4 generates a malformed pessimistic-lock clause ("... with rs with rs") for Derby + // and a "for share of " clause that MySQL does not support + @ExcludeIn({Target.DERBY, Target.MYSQL}) public void lockMode() { var query = query().from(cat).setLockMode(LockModeType.PESSIMISTIC_READ).select(cat).createQuery(); @@ -221,6 +220,9 @@ public void lockMode() { } @Test + // Hibernate 7.4 generates a malformed pessimistic-lock clause ("... with rs with rs") for Derby + // and a "for share of " clause that MySQL does not support + @ExcludeIn({Target.DERBY, Target.MYSQL}) public void lockMode2() { assertThat(query().from(cat).setLockMode(LockModeType.PESSIMISTIC_READ).select(cat).fetch()) .isNotEmpty(); @@ -235,7 +237,7 @@ public void queryExposure() { } @Test - @Ignore // isn't a valid JPQL query + @Disabled // isn't a valid JPQL query public void subquery_uniqueResult() { var cat2 = new QCat("cat2"); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java index 0e67c52faf..6002800573 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPACollectionAnyVisitorTest.java @@ -24,7 +24,7 @@ import com.querydsl.jpa.domain.QCompany; import com.querydsl.jpa.domain.QDomesticCat; import com.querydsl.jpa.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPACollectionAnyVisitorTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java index c9a84204e4..9f254b84f3 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAExecuteWithKeyTest.java @@ -25,11 +25,11 @@ import jakarta.persistence.EntityTransaction; import jakarta.persistence.Persistence; import java.util.Map; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JPAExecuteWithKeyTest { @@ -37,7 +37,7 @@ public class JPAExecuteWithKeyTest { private EntityManager entityManager; private EntityTransaction tx; - @BeforeClass + @BeforeAll public static void setUpClass() { emf = Persistence.createEntityManagerFactory( @@ -51,21 +51,21 @@ public static void setUpClass() { "hibernate.show_sql", "false")); } - @AfterClass + @AfterAll public static void tearDownClass() { if (emf != null) { emf.close(); } } - @Before + @BeforeEach public void setUp() { entityManager = emf.createEntityManager(); tx = entityManager.getTransaction(); tx.begin(); } - @After + @AfterEach public void tearDown() { if (tx != null && tx.isActive()) { tx.rollback(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java index 31781a1917..ab08ebbcee 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAIntegrationBase.java @@ -15,20 +15,13 @@ import com.querydsl.jpa.impl.JPAProvider; import com.querydsl.jpa.impl.JPAUtil; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) +@ExtendWith({JPATestExtension.class, TargetExtension.class, JPAProviderExtension.class}) public class JPAIntegrationBase extends ParsingTest implements JPATest { - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - - @Rule @ClassRule public static TestRule hibernateOnly = new JPAProviderRule(); - private EntityManager em; private JPQLTemplates templates; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderExtension.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderExtension.java new file mode 100644 index 0000000000..d782f0e5b5 --- /dev/null +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderExtension.java @@ -0,0 +1,58 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.jpa; + +import com.querydsl.core.Target; +import java.util.Arrays; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code JPAProviderRule}. Disables a test annotated with {@link + * NoEclipseLink}, {@link NoOpenJPA}, {@link NoBatooJPA} or {@link NoHibernate} when the active + * {@link Mode#mode} matches the corresponding provider. + */ +public class JPAProviderExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var element = context.getElement().orElse(null); + if (element == null) { + return ConditionEvaluationResult.enabled("No annotated element"); + } + var mode = Mode.mode.get(); + if (mode == null) { + return ConditionEvaluationResult.enabled("No mode configured"); + } + var noEclipseLink = element.getAnnotation(NoEclipseLink.class); + var noOpenJPA = element.getAnnotation(NoOpenJPA.class); + var noBatooJPA = element.getAnnotation(NoBatooJPA.class); + var noHibernate = element.getAnnotation(NoHibernate.class); + if (noEclipseLink != null && applies(noEclipseLink.value()) && mode.contains("-eclipselink")) { + return ConditionEvaluationResult.disabled("Disabled for EclipseLink"); + } else if (noOpenJPA != null && applies(noOpenJPA.value()) && mode.contains("-openjpa")) { + return ConditionEvaluationResult.disabled("Disabled for OpenJPA"); + } else if (noBatooJPA != null && applies(noBatooJPA.value()) && mode.contains("-batoo")) { + return ConditionEvaluationResult.disabled("Disabled for BatooJPA"); + } else if (noHibernate != null && applies(noHibernate.value()) && !mode.contains("-")) { + return ConditionEvaluationResult.disabled("Disabled for Hibernate"); + } + return ConditionEvaluationResult.enabled("Enabled for mode " + mode); + } + + private boolean applies(Target[] targets) { + return targets.length == 0 || Arrays.asList(targets).contains(Mode.target.get()); + } +} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java deleted file mode 100644 index 7af87fd192..0000000000 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderRule.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.querydsl.jpa; - -import com.querydsl.core.Target; -import com.querydsl.core.testutil.EmptyStatement; -import java.util.Arrays; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * @author tiwe - */ -public class JPAProviderRule implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - var noEclipseLink = description.getAnnotation(NoEclipseLink.class); - var noOpenJPA = description.getAnnotation(NoOpenJPA.class); - var noBatooJPA = description.getAnnotation(NoBatooJPA.class); - var noHibernate = description.getAnnotation(NoHibernate.class); - var mode = Mode.mode.get(); - if (mode == null) { - return base; - } else if (noEclipseLink != null - && applies(noEclipseLink.value()) - && mode.contains("-eclipselink")) { - return EmptyStatement.DEFAULT; - } else if (noOpenJPA != null && applies(noOpenJPA.value()) && mode.contains("-openjpa")) { - return EmptyStatement.DEFAULT; - } else if (noBatooJPA != null && applies(noBatooJPA.value()) && mode.contains("-batoo")) { - return EmptyStatement.DEFAULT; - } else if (noHibernate != null && applies(noHibernate.value()) && !mode.contains("-")) { - return EmptyStatement.DEFAULT; - } else { - return base; - } - } - - private boolean applies(Target[] targets) { - return targets.length == 0 || Arrays.asList(targets).contains(Mode.target.get()); - } -} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java index dea5041bcc..710cd170f0 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAProviderTest.java @@ -11,9 +11,9 @@ import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; // 5.664 public class JPAProviderTest { @@ -22,7 +22,7 @@ public class JPAProviderTest { private EntityManager em; - @After + @AfterEach public void tearDown() { if (em != null) { em.close(); @@ -91,7 +91,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } @Test - @Ignore // doesn't work on JDK 7 + @Disabled // doesn't work on JDK 7 public void openJPA() { factory = Persistence.createEntityManagerFactory("derby-openjpa"); em = factory.createEntityManager(); @@ -101,7 +101,7 @@ public void openJPA() { } @Test - @Ignore // temporarily ignored, since Batoo hangs on EntityManager creation + @Disabled // temporarily ignored, since Batoo hangs on EntityManager creation public void batoo() { factory = Persistence.createEntityManagerFactory("h2-batoo"); em = factory.createEntityManager(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryConverterCollectionContainsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryConverterCollectionContainsTest.java index ae1c0261e3..08289ecb61 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryConverterCollectionContainsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryConverterCollectionContainsTest.java @@ -7,17 +7,17 @@ import com.querydsl.jpa.domain.PotionEffect; import com.querydsl.jpa.domain.QAlchemist; import com.querydsl.jpa.impl.JPAQueryFactory; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; import java.util.Collections; import java.util.EnumSet; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) +@ExtendWith(JPATestExtension.class) public class JPAQueryConverterCollectionContainsTest implements JPATest { private EntityManager em; @@ -33,7 +33,7 @@ public void setEntityManager(EntityManager em) { private static final QAlchemist qAlchemist = QAlchemist.alchemist; - @Before + @BeforeEach public void setUpData() { if (em == null) { throw new IllegalStateException("EntityManager has not been set by JPATestRunner."); @@ -66,7 +66,7 @@ public void setUpData() { em.clear(); } - @After + @AfterEach public void tearDown() { if (em != null && em.getTransaction().isActive()) { em.getTransaction().rollback(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryCustomTypeWrapperTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryCustomTypeWrapperTest.java index 6371ea502d..b333c802a6 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryCustomTypeWrapperTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryCustomTypeWrapperTest.java @@ -7,15 +7,15 @@ import com.querydsl.core.types.dsl.TypeWrapper; import com.querydsl.jpa.domain.*; import com.querydsl.jpa.impl.JPAQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; import java.math.BigDecimal; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) +@ExtendWith(JPATestExtension.class) public class JPAQueryCustomTypeWrapperTest implements JPATest { private EntityManager em; @@ -25,7 +25,7 @@ public void setEntityManager(EntityManager em) { this.em = em; } - @Before + @BeforeEach public void setupData() { em.createQuery("delete from Invoice").executeUpdate(); em.persist(new Invoice("00000000-0000-0000-0000-000000000001", "A", new Money("111"))); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java index ed5e80d29f..89dd948a79 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryFactoryTest.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.function.Supplier; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JPAQueryFactoryTest { @@ -41,7 +41,7 @@ public class JPAQueryFactoryTest { private Map properties = new HashMap<>(); - @Before + @BeforeEach public void setUp() { factoryMock = EasyMock.createMock(EntityManagerFactory.class); mock = EasyMock.createMock(EntityManager.class); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java index b88cbbc5b1..a5105d8929 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMixinTest.java @@ -15,7 +15,7 @@ import com.querydsl.jpa.domain4.QBookVersion; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPAQueryMixinTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java index cb460b22c2..de1fc2d2ba 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutability2Test.java @@ -15,16 +15,17 @@ import static com.querydsl.core.types.dsl.Expressions.numberOperation; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.types.Operator; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.impl.JPAQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) +@ExtendWith(JPATestExtension.class) public class JPAQueryMutability2Test implements JPATest { private EntityManager entityManager; @@ -121,14 +122,18 @@ public void clone_keep_templates() { .fetchOne(); } - @Test(expected = IllegalArgumentException.class) + @Test public void clone_lose_templates() { - var cat = QCat.cat; - JPAQuery query = query(customTemplates).from(cat); - // clone using the entitymanager's default templates - query - .clone(entityManager) - .select(numberOperation(Integer.class, customOperator, cat.floatProperty)) - .fetchOne(); + assertThatThrownBy( + () -> { + var cat = QCat.cat; + JPAQuery query = query(customTemplates).from(cat); + // clone using the entitymanager's default templates + query + .clone(entityManager) + .select(numberOperation(Integer.class, customOperator, cat.floatProperty)) + .fetchOne(); + }) + .isInstanceOf(IllegalArgumentException.class); } } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java index 4debde362e..505f9b65a1 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java @@ -19,18 +19,18 @@ import com.querydsl.jpa.domain.Cat; import com.querydsl.jpa.domain.sql.SAnimal_; import com.querydsl.jpa.sql.JPASQLQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import com.querydsl.sql.DerbyTemplates; import com.querydsl.sql.SQLTemplates; import jakarta.persistence.EntityManager; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@Ignore -@RunWith(JPATestRunner.class) +@Disabled +@ExtendWith(JPATestExtension.class) public class JPAQueryMutabilityTest implements JPATest { private static final SQLTemplates derbyTemplates = new DerbyTemplates(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java index 555eb3e518..3903a230ed 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java @@ -24,25 +24,18 @@ import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.domain.sql.SAnimal_; import com.querydsl.jpa.sql.JPASQLQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import com.querydsl.sql.SQLTemplates; import jakarta.persistence.EntityManager; import java.util.Arrays; import java.util.HashMap; import java.util.List; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; - -@RunWith(JPATestRunner.class) -public class JPASQLBase extends AbstractSQLTest implements JPATest { - - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; - @Rule @ClassRule public static TestRule hibernateOnly = new JPAProviderRule(); +@ExtendWith({JPATestExtension.class, TargetExtension.class, JPAProviderExtension.class}) +public class JPASQLBase extends AbstractSQLTest implements JPATest { private final SQLTemplates templates = Mode.getSQLTemplates(); @@ -61,7 +54,7 @@ public void setEntityManager(EntityManager entityManager) { this.entityManager = entityManager; } - @Before + @BeforeEach public void setUp() { if (query().from(cat).fetchCount() == 0) { entityManager.persist(new Cat("Beck", 1, Color.BLACK)); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java index 707d979175..b58c913fc9 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLQueryTest.java @@ -14,12 +14,13 @@ package com.querydsl.jpa; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.hibernate.HibernateQuery; import com.querydsl.jpa.impl.JPAQuery; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JPQLQueryTest { @@ -27,39 +28,63 @@ public class JPQLQueryTest { private HibernateQuery query = new HibernateQuery(); - @Before + @BeforeEach public void setUp() { query.from(cat); } - @Test(expected = IllegalArgumentException.class) + @Test public void innerJoinPEntityOfPPEntityOfP() { - query.innerJoin(cat.mate, cat.mate); + assertThatThrownBy( + () -> { + query.innerJoin(cat.mate, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void innerJoinPathOfQextendsCollectionOfPPathOfP() { - query.innerJoin(cat.kittens, cat.mate); + assertThatThrownBy( + () -> { + query.innerJoin(cat.kittens, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void joinPEntityOfPPEntityOfP() { - query.join(cat.mate, cat.mate); + assertThatThrownBy( + () -> { + query.join(cat.mate, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void joinPathOfQextendsCollectionOfPPathOfP() { - query.join(cat.kittens, cat.mate); + assertThatThrownBy( + () -> { + query.join(cat.kittens, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void leftJoinPEntityOfPPEntityOfP() { - query.leftJoin(cat.mate, cat.mate); + assertThatThrownBy( + () -> { + query.leftJoin(cat.mate, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void leftJoinPathOfQextendsCollectionOfPPathOfP() { - query.leftJoin(cat.kittens, cat.mate); + assertThatThrownBy( + () -> { + query.leftJoin(cat.kittens, cat.mate); + }) + .isInstanceOf(IllegalArgumentException.class); } @Test diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java index 2be7a13986..e0cad3e96c 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLSerializerTest.java @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPQLSerializerTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java index e635fc6ff9..38466b7eb0 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JPQLTemplatesTest.java @@ -8,7 +8,7 @@ import com.querydsl.core.types.TemplatesTestUtils; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java index 4f5238a5ea..fd680743f7 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinFlagsTest.java @@ -17,7 +17,7 @@ import static com.querydsl.jpa.Constants.cat1; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JoinFlagsTest extends AbstractQueryTest { @Test diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java index 582e1fb742..ee3cfb6944 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JoinTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.StringPath; import com.querydsl.jpa.hibernate.HibernateQuery; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JoinTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JpaNativeInsertSerializerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JpaNativeInsertSerializerTest.java index 19f6627cb4..67c1512e4f 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JpaNativeInsertSerializerTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/JpaNativeInsertSerializerTest.java @@ -14,6 +14,7 @@ package com.querydsl.jpa; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; @@ -26,7 +27,7 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.SQLTemplates; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JpaNativeInsertSerializerTest { @@ -134,14 +135,18 @@ public void serializeInsert_collects_constants_in_order() { assertThat(serializer.getConstants()).containsExactly("a", "b"); } - @Test(expected = IllegalArgumentException.class) + @Test public void serializeInsert_rejects_mismatched_column_value_counts() { - var entity = QGeneratedKeyEntity.generatedKeyEntity; - var serializer = newSerializer(SQLTemplates.DEFAULT); - - serializer.serializeInsert( - GeneratedKeyEntity.class, - List.of(entity.name), - List.of(Expressions.constant("a"), Expressions.constant("b"))); + assertThatThrownBy( + () -> { + var entity = QGeneratedKeyEntity.generatedKeyEntity; + var serializer = newSerializer(SQLTemplates.DEFAULT); + + serializer.serializeInsert( + GeneratedKeyEntity.class, + List.of(entity.name), + List.of(Expressions.constant("a"), Expressions.constant("b"))); + }) + .isInstanceOf(IllegalArgumentException.class); } } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java index 45642cf222..c53a790337 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MapOperationsTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.jpa.impl.JPAQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MapOperationsTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java index 2d993fc8f4..21ad348c79 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/MathTest.java @@ -17,7 +17,7 @@ import static com.querydsl.jpa.Constants.kitten; import com.querydsl.jpa.domain.QCat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MathTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java index 38053a2832..967658d13a 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java @@ -23,29 +23,19 @@ public final class Mode { public static final ThreadLocal target = new ThreadLocal<>(); public static SQLTemplates getSQLTemplates() { - switch (target.get()) { - case CUBRID: - return new CUBRIDTemplates(); - case DERBY: - return new DerbyTemplates(); - case H2: - return new H2Templates(); - case HSQLDB: - return new HSQLDBTemplates(); - case SQLSERVER: - return new SQLServer2008Templates(); - case MYSQL: - return new MySQLTemplates(); - case ORACLE: - return new OracleTemplates(); - case POSTGRESQL: - return new PostgreSQLTemplates(); - case SQLITE: - return new SQLiteTemplates(); - case TERADATA: - return new TeradataTemplates(); - } - throw new IllegalStateException("Unknown mode " + mode); + return switch (target.get()) { + case CUBRID -> new CUBRIDTemplates(); + case DERBY -> new DerbyTemplates(); + case H2 -> new H2Templates(); + case HSQLDB -> new HSQLDBTemplates(); + case SQLSERVER -> new SQLServer2008Templates(); + case MYSQL -> new MySQLTemplates(); + case ORACLE -> new OracleTemplates(); + case POSTGRESQL -> new PostgreSQLTemplates(); + case SQLITE -> new SQLiteTemplates(); + case TERADATA -> new TeradataTemplates(); + default -> throw new IllegalStateException("Unknown mode " + mode); + }; } private Mode() {} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java index 3fa2c425e1..ca10946ac4 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java @@ -22,7 +22,7 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.MySQLTemplates; import jakarta.persistence.Column; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NativeSQLSerializerTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java index 5959d2d27e..590354527b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderExpressionsTest.java @@ -16,7 +16,7 @@ import static com.querydsl.jpa.Constants.cat; import static com.querydsl.jpa.Constants.kitten; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OrderExpressionsTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java index 271297a130..b7a2eb43f9 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/OrderHelperTest.java @@ -6,7 +6,7 @@ import com.querydsl.core.types.dsl.PathBuilder; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OrderHelperTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java index bf32257b63..fd7900854c 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/PackageVerification.java @@ -25,7 +25,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Scanner; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PackageVerification { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java index 8bd2e63c2d..310d0ab288 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/ParsingTest.java @@ -73,8 +73,8 @@ import com.querydsl.jpa.domain.QFooDTO; import com.querydsl.jpa.domain.QItem; import com.querydsl.jpa.domain.QProduct; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ParsingTest extends AbstractQueryTest { @@ -135,7 +135,7 @@ public void docoExamples910_2() throws Exception { } @Test - @Ignore + @Disabled public void docoExamples910_3() throws Exception { query() .from(cat) @@ -397,7 +397,7 @@ public void docoExamples97_9() throws Exception { } @Test - @Ignore + @Disabled // @NoEclipseLink public void docoExamples97_10() throws Exception { query() @@ -481,7 +481,7 @@ public void docoExamples98_10() throws Exception { @Test @NoEclipseLink @ExcludeIn({DERBY, HSQLDB, H2, MYSQL, ORACLE, POSTGRESQL}) - @Ignore + @Disabled public void docoExamples98_11() throws Exception { query() .from(item, ord) @@ -656,13 +656,13 @@ public void casts_2() throws Exception { } @Test - @Ignore + @Disabled public void groupBy() throws Exception { query().from(qat).groupBy(qat.breed).parse(); } @Test - @Ignore + @Disabled public void groupBy_2() throws Exception { query().from(qat).groupBy(qat.breed, qat.eyecolor).parse(); } @@ -708,7 +708,7 @@ public void not_8() throws Exception { } @Test - @Ignore + @Disabled public void orderBy() throws Exception { // NOT SUPPORTED query().from(qat).orderBy(qat.toes.avg().asc()).parse(); @@ -728,14 +728,14 @@ public void select1() throws Exception { } @Test - @Ignore + @Disabled public void sum() { // NOT SUPPORTED query().from(cat).select(cat.kittens.size().sumLong()).parse(); } @Test - @Ignore + @Disabled public void sum_2() { // NOT SUPPORTED query().from(cat).where(cat.kittens.size().sumLong().gt(0)).select(cat).parse(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java index b9823db565..fa477a41e2 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryHandlerTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryHandlerTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java index c22646062c..39dba8837e 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import org.hibernate.Session; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class QueryMutabilityTest { @@ -41,7 +41,7 @@ public void setSession(Session session) { } @Test - @Ignore + @Disabled public void queryMutability() throws SecurityException, IllegalArgumentException, diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java index d3e47a5f78..cffdad7b0a 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/QueryPerformanceTest.java @@ -4,36 +4,35 @@ import com.querydsl.core.Target; import com.querydsl.core.Tuple; -import com.querydsl.core.testutil.Performance; import com.querydsl.jpa.domain.Cat; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.impl.JPAQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) -@Ignore -@Category(Performance.class) +@ExtendWith(JPATestExtension.class) +@Disabled +@Tag("com.querydsl.core.testutil.Performance") public class QueryPerformanceTest implements JPATest { private static final int iterations = 1000; private EntityManager entityManager; - @BeforeClass + @BeforeAll public static void setUpClass() { Mode.mode.set("h2perf"); Mode.target.set(Target.H2); } - @AfterClass + @AfterAll public static void tearDownClass() { Mode.mode.remove(); Mode.target.remove(); @@ -43,7 +42,7 @@ private JPAQuery query() { return new JPAQuery(entityManager); } - @Before + @BeforeEach public void setUp() { if (query().from(QCat.cat).fetchCount() == 0) { for (var i = 0; i < iterations; i++) { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java index 9625d47336..53d5ba6dc0 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/RelationalFunctionCallTest.java @@ -26,7 +26,7 @@ import com.querydsl.sql.SQLExpressions; import com.querydsl.sql.SQLSerializer; import com.querydsl.sql.SQLServerTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalFunctionCallTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java index 6cf382df5f..c42c8aa78e 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SerializationBase.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Predicate; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.impl.JPAQuery; -import com.querydsl.jpa.testutil.JPATestRunner; +import com.querydsl.jpa.testutil.JPATestExtension; import jakarta.persistence.EntityManager; import java.io.File; import java.io.FileInputStream; @@ -27,10 +27,10 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@RunWith(JPATestRunner.class) +@ExtendWith(JPATestExtension.class) public class SerializationBase implements JPATest { private QCat cat = QCat.cat; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java index ea364c3b79..15b5d251a8 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SignatureTest.java @@ -16,7 +16,7 @@ import com.querydsl.core.FilteredClause; import com.querydsl.jpa.hibernate.HibernateQuery; import com.querydsl.jpa.impl.JPAQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignatureTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java index c3ddef9155..cbe52c3e45 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/StringOperationsTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StringOperationsTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java index 953c09cc1a..5715535358 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/SubQueryTest.java @@ -19,14 +19,14 @@ import static com.querydsl.jpa.JPAExpressions.selectFrom; import static com.querydsl.jpa.JPAExpressions.selectOne; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.querydsl.core.domain.QCat; import com.querydsl.core.testutil.Serialization; import com.querydsl.jpa.domain.Cat; import com.querydsl.jpa.domain.QEmployee; import com.querydsl.jpa.domain.QUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SubQueryTest extends AbstractQueryTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetExtension.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetExtension.java new file mode 100644 index 0000000000..dc99d7da3f --- /dev/null +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetExtension.java @@ -0,0 +1,51 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.jpa; + +import com.querydsl.core.testutil.ExcludeIn; +import com.querydsl.core.testutil.IncludeIn; +import java.util.Arrays; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code TargetRule}. Disables a test (or container) when the + * active {@link Mode#target} is excluded via {@link ExcludeIn} or not part of {@link IncludeIn}. + */ +public class TargetExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var target = Mode.target.get(); + if (target == null) { + return ConditionEvaluationResult.enabled("No target configured"); + } + var element = context.getElement().orElse(null); + if (element == null) { + return ConditionEvaluationResult.enabled("No annotated element"); + } + // excluded in given targets + var ex = element.getAnnotation(ExcludeIn.class); + if (ex != null && Arrays.asList(ex.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Excluded in target " + target); + } + // included only in given targets + var in = element.getAnnotation(IncludeIn.class); + if (in != null && !Arrays.asList(in.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Not included in target " + target); + } + return ConditionEvaluationResult.enabled("Enabled for target " + target); + } +} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java deleted file mode 100644 index 0402b6daf0..0000000000 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TargetRule.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.querydsl.jpa; - -import com.querydsl.core.Target; -import com.querydsl.core.testutil.EmptyStatement; -import com.querydsl.core.testutil.ExcludeIn; -import com.querydsl.core.testutil.IncludeIn; -import java.util.Arrays; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * @author tiwe - */ -public class TargetRule implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - var target = Mode.target.get(); - var run = target == null || isExecuted(description, target); - return run ? base : EmptyStatement.DEFAULT; - } - - private boolean isExecuted(Description description, Target target) { - var ex = description.getAnnotation(ExcludeIn.class); - // excluded in given targets - if (ex != null && Arrays.asList(ex.value()).contains(target)) { - return false; - } - // included only in given targets - var in = description.getAnnotation(IncludeIn.class); - if (in != null && !Arrays.asList(in.value()).contains(target)) { - return false; - } - return true; - } -} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java index b718a376d2..244ebe2983 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TupleTest.java @@ -18,13 +18,13 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.SubQueryExpression; import com.querydsl.jpa.domain.QCat; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class TupleTest extends AbstractQueryTest { @Test - @Ignore // FIXME + @Disabled // FIXME public void test() { var cat = QCat.cat; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java index a3d310efb0..aa70c97548 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/TypeCastTest.java @@ -21,7 +21,7 @@ import com.querydsl.jpa.domain.QAnimal; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.domain.QInheritedProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeCastTest { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java index 778de18edb..de7511da89 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/UniqueResultsTest.java @@ -18,14 +18,14 @@ import com.querydsl.jpa.domain.Cat; import com.querydsl.jpa.domain.QCat; import com.querydsl.jpa.hibernate.HibernateQuery; -import com.querydsl.jpa.testutil.HibernateTestRunner; +import com.querydsl.jpa.testutil.HibernateTestExtension; import org.hibernate.Session; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -@Ignore -@RunWith(HibernateTestRunner.class) +@Disabled +@ExtendWith(HibernateTestExtension.class) public class UniqueResultsTest implements HibernateTest { private Session session; diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java index e949efd4c8..c13febd121 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Account.java @@ -23,7 +23,7 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** The Class Account. */ @SuppressWarnings("serial") diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java index 81a1873c9d..cb42749b5b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractJPASuite.java @@ -1,14 +1,11 @@ package com.querydsl.jpa.suites; import com.querydsl.jpa.Mode; -import org.junit.AfterClass; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; -@RunWith(Enclosed.class) public abstract class AbstractJPASuite { - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { Mode.mode.remove(); Mode.target.remove(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java index 30e9c93442..0879721ecd 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/AbstractSuite.java @@ -1,14 +1,11 @@ package com.querydsl.jpa.suites; import com.querydsl.jpa.Mode; -import org.junit.AfterClass; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; -@RunWith(Enclosed.class) public abstract class AbstractSuite { - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { Mode.mode.remove(); Mode.target.remove(); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java index 79671ede15..c94d4588eb 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbyEclipseLinkTest.java @@ -1,19 +1,20 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.Derby; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class DerbyEclipseLinkTest extends AbstractJPASuite { - public static class JPA extends JPABase { + @Nested + class JPA extends JPABase { @Override public void order_stringValue() { // not supported in MySQL/EclipseLink @@ -35,13 +36,16 @@ public void order_stringValue_toBigInteger() { } } - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("derby-eclipselink"); Mode.target.set(Target.DERBY); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java index accbeb9c07..dfeb4cc680 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/DerbySuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.Derby; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,25 +8,32 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class DerbySuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("derby"); Mode.target.set(Target.DERBY); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java index 114076a629..2a0d0b0fd4 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2BatooTest.java @@ -1,29 +1,33 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.H2; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Ignore -@Category(H2.class) +@Disabled +@Tag("com.querydsl.core.testutil.H2") public class H2BatooTest extends AbstractJPASuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("h2-batoo"); Mode.target.set(Target.H2); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java index 6de0b54902..6c1703ece4 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2EclipseLinkTest.java @@ -1,27 +1,31 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.H2; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2EclipseLinkTest extends AbstractJPASuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("h2-eclipselink"); Mode.target.set(Target.H2); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java index 6ba451fca5..f2496f9657 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2OpenJPATest.java @@ -1,29 +1,33 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.H2; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Ignore -@Category(H2.class) +@Disabled +@Tag("com.querydsl.core.testutil.H2") public class H2OpenJPATest extends AbstractJPASuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("h2-openjpa"); Mode.target.set(Target.H2); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java index dd8d97e83c..6a74da5a0b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/H2SuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.H2; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,25 +8,32 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2SuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("h2"); Mode.target.set(Target.H2); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java index 121fe8e488..e23ef7a0a5 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBEclipseLinkTest.java @@ -1,27 +1,31 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.HSQLDB; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(HSQLDB.class) +@Tag("com.querydsl.core.testutil.HSQLDB") public class HSQLDBEclipseLinkTest extends AbstractJPASuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("hsqldb-eclipselink"); Mode.target.set(Target.HSQLDB); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java index 88339ae879..f0d41de356 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/HSQLDBSuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.HSQLDB; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,25 +8,32 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(HSQLDB.class) +@Tag("com.querydsl.core.testutil.HSQLDB") public class HSQLDBSuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("hsqldb"); Mode.target.set(Target.HSQLDB); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java index 1e51c03093..aa05ec4005 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MSSQLSuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,25 +8,32 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLSuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("mssql"); Mode.target.set(Target.SQLSERVER); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java index 832b1a0fcd..4453035835 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLEclipseLinkTest.java @@ -1,19 +1,20 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.MySQL; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLEclipseLinkTest extends AbstractJPASuite { - public static class JPA extends JPABase { + @Nested + class JPA extends JPABase { @Override public void cast() { // not supported in MySQL/EclipseLink @@ -55,13 +56,16 @@ public void order_nullsLast() { } } - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("mysql-eclipselink"); Mode.target.set(Target.MYSQL); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java index 6af143c668..84afa6c247 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/MySQLSuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.MySQL; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,35 +8,42 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLSuiteTest extends AbstractSuite { - public static class JPA extends JPABase { + @Nested + class JPA extends JPABase { @Override public void order_stringValue_toLong() { // not supported } } - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase { + @Nested + class Hibernate extends HibernateBase { @Override public void order_stringValue_toLong() { // not supported } } - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("mysql"); Mode.target.set(Target.MYSQL); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java index a77959409e..7ed5e441b6 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/OracleSuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.Oracle; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -10,28 +9,35 @@ import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; import java.util.TimeZone; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Oracle.class) +@Tag("com.querydsl.core.testutil.Oracle") public class OracleSuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} private static TimeZone defaultZone; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("oracle"); Mode.target.set(Target.ORACLE); @@ -44,7 +50,7 @@ public static void setUp() throws Exception { TimeZone.setDefault(TimeZone.getTimeZone("UTC")); } - @AfterClass + @AfterAll public static void tearDown() { TimeZone.setDefault(defaultZone); } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java index c7ba9e63b8..b4dc448c1e 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLEclipseLinkSuiteTest.java @@ -1,27 +1,31 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.jpa.JPABase; import com.querydsl.jpa.JPAIntegrationBase; import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLEclipseLinkSuiteTest extends AbstractJPASuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("postgresql-eclipselink"); Mode.target.set(Target.POSTGRESQL); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java index 26a249c6a4..0e42ef681b 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/suites/PostgreSQLSuiteTest.java @@ -1,7 +1,6 @@ package com.querydsl.jpa.suites; import com.querydsl.core.Target; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.jpa.HibernateBase; import com.querydsl.jpa.HibernateSQLBase; import com.querydsl.jpa.JPABase; @@ -9,25 +8,32 @@ import com.querydsl.jpa.JPASQLBase; import com.querydsl.jpa.Mode; import com.querydsl.jpa.SerializationBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLSuiteTest extends AbstractSuite { - public static class JPA extends JPABase {} + @Nested + class JPA extends JPABase {} - public static class JPASQL extends JPASQLBase {} + @Nested + class JPASQL extends JPASQLBase {} - public static class JPAIntegration extends JPAIntegrationBase {} + @Nested + class JPAIntegration extends JPAIntegrationBase {} - public static class Serialization extends SerializationBase {} + @Nested + class Serialization extends SerializationBase {} - public static class Hibernate extends HibernateBase {} + @Nested + class Hibernate extends HibernateBase {} - public static class HibernateSQL extends HibernateSQLBase {} + @Nested + class HibernateSQL extends HibernateSQLBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Mode.mode.set("postgresql"); Mode.target.set(Target.POSTGRESQL); diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java index 6cb25cea82..efc4037077 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/DialectSupportTest.java @@ -5,7 +5,12 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Template; import com.querydsl.sql.HSQLDBTemplates; -import org.junit.Test; +import com.querydsl.sql.SQLServer2012Templates; +import org.hibernate.boot.model.FunctionContributions; +import org.hibernate.query.sqm.function.SqmFunctionRegistry; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.type.spi.TypeConfiguration; +import org.junit.jupiter.api.Test; public class DialectSupportTest { @@ -16,4 +21,67 @@ public void convert() { Template concat = HSQLDBTemplates.DEFAULT.getTemplate(Ops.CONCAT); assertThat(DialectSupport.convert(concat)).isEqualTo("?1 || ?2"); } + + @Test + public void createFunction_returns_null_type_for_operators_without_a_hibernate_basic_type() { + // CURRENT_DATE is declared with a generic Comparable type that does not map to a Hibernate + // BasicType, so HibernateUtil.getType(...) returns null. + var template = + DialectSupport.createFunction(SQLServer2012Templates.DEFAULT, Ops.DateTimeOps.CURRENT_DATE); + + assertThat(template.type()).isNull(); + assertThat(template.pattern()).isEqualTo("cast(getdate() as date)"); + } + + @Test + public void extendRegistry_registers_pattern_without_type_when_type_is_null() { + var functionRegistry = new SqmFunctionRegistry(); + FunctionContributions contributions = + contributionsBackedBy(functionRegistry, new TypeConfiguration()); + + var template = + DialectSupport.createFunction(SQLServer2012Templates.DEFAULT, Ops.DateTimeOps.CURRENT_DATE); + assertThat(template.type()).isNull(); + + // The null-type branch must register the pattern without resolving a return type instead of + // failing on the null type. + DialectSupport.extendRegistry("current_date", template, contributions); + + assertThat(functionRegistry.findFunctionDescriptor("current_date")).isNotNull(); + } + + @Test + public void extendRegistry_registers_typed_patterns_from_templates() { + var functionRegistry = new SqmFunctionRegistry(); + FunctionContributions contributions = + contributionsBackedBy(functionRegistry, new TypeConfiguration()); + + // The bulk overload registers the date-part functions, whose types (e.g. Integer) do map to a + // Hibernate BasicType and therefore exercise the typed branch. + DialectSupport.extendRegistry(SQLServer2012Templates.DEFAULT, contributions); + + assertThat(functionRegistry.findFunctionDescriptor("year")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("month")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("second")).isNotNull(); + } + + private static FunctionContributions contributionsBackedBy( + SqmFunctionRegistry functionRegistry, TypeConfiguration typeConfiguration) { + return new FunctionContributions() { + @Override + public SqmFunctionRegistry getFunctionRegistry() { + return functionRegistry; + } + + @Override + public TypeConfiguration getTypeConfiguration() { + return typeConfiguration; + } + + @Override + public ServiceRegistry getServiceRegistry() { + return null; + } + }; + } } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java index 7f5edccfa3..03ea37d0b5 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/JPAPathBuilderValidatorTest.java @@ -6,20 +6,20 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; import java.util.Collection; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JPAPathBuilderValidatorTest { private EntityManagerFactory entityManagerFactory; - @Before + @BeforeEach public void setUp() { entityManagerFactory = Persistence.createEntityManagerFactory("h2"); } - @After + @AfterEach public void tearDown() { entityManagerFactory.close(); } diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/QSQLServerDialectTest.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/QSQLServerDialectTest.java new file mode 100644 index 0000000000..fb620734bc --- /dev/null +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/support/QSQLServerDialectTest.java @@ -0,0 +1,76 @@ +package com.querydsl.jpa.support; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Properties; +import org.hibernate.SessionFactory; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.cfg.Configuration; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.query.sqm.function.SqmFunctionRegistry; +import org.hibernate.service.ServiceRegistry; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +/** + * Boots an offline Hibernate {@link SessionFactory} with the dialect forced to {@link + * QSQLServerDialect} so that the functions it contributes through {@code + * initializeFunctionRegistry} can be inspected without a running SQL Server. JDBC metadata access + * is disabled so the throwaway H2 connection is never probed for dialect resolution. + */ +public class QSQLServerDialectTest { + + private static SessionFactory sessionFactory; + private static SqmFunctionRegistry functionRegistry; + + @BeforeAll + static void bootSessionFactory() { + var props = new Properties(); + props.put("hibernate.dialect", QSQLServerDialect.class.getName()); + props.put("hibernate.connection.driver_class", "org.h2.Driver"); + props.put("hibernate.connection.url", "jdbc:h2:mem:qsqlserverdialect;DB_CLOSE_DELAY=-1"); + props.put("hibernate.connection.username", "sa"); + props.put("hibernate.connection.password", ""); + // Keep the forced SQL Server dialect: never inspect the H2 connection to resolve a dialect. + props.put("hibernate.boot.allow_jdbc_metadata_access", "false"); + props.put("hibernate.hbm2ddl.auto", "none"); + + ServiceRegistry serviceRegistry = + new StandardServiceRegistryBuilder().applySettings(props).build(); + var cfg = new Configuration(); + cfg.setProperties(props); + sessionFactory = cfg.buildSessionFactory(serviceRegistry); + functionRegistry = + sessionFactory + .unwrap(SessionFactoryImplementor.class) + .getQueryEngine() + .getSqmFunctionRegistry(); + } + + @AfterAll + static void closeSessionFactory() { + if (sessionFactory != null) { + sessionFactory.close(); + } + } + + @Test + public void registers_querydsl_date_functions() { + // The date-part functions contributed from SQLServer2012Templates must be present. + assertThat(functionRegistry.findFunctionDescriptor("year")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("month")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("week")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("day")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("hour")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("minute")).isNotNull(); + assertThat(functionRegistry.findFunctionDescriptor("second")).isNotNull(); + } + + @Test + public void registers_current_date() { + // current_date has a null Hibernate type (Comparable) and is registered through the no-type + // branch of DialectSupport; the dialect must still expose it. + assertThat(functionRegistry.findFunctionDescriptor("current_date")).isNotNull(); + } +} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestExtension.java similarity index 57% rename from querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java rename to querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestExtension.java index d73c3f9f00..8335bc9918 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestRunner.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/HibernateTestExtension.java @@ -13,34 +13,30 @@ */ package com.querydsl.jpa.testutil; -import static org.assertj.core.api.Assertions.assertThat; - import com.querydsl.core.Target; import com.querydsl.jpa.HibernateTest; import com.querydsl.jpa.Mode; import com.querydsl.jpa.domain.Domain; import java.sql.DriverManager; import java.sql.SQLException; -import java.util.List; import java.util.Properties; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistry; -import org.junit.rules.MethodRule; -import org.junit.runner.Description; -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.extension.AfterAllCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstancePostProcessor; /** - * @author tiwe + * JUnit 5 replacement for the former {@code HibernateTestRunner}. Builds a single {@link + * SessionFactory}/{@link Session} (with an open transaction) per test class, injects the session + * into every {@link HibernateTest} instance and rolls everything back afterwards. */ -public class HibernateTestRunner extends BlockJUnit4ClassRunner { +public class HibernateTestExtension + implements BeforeAllCallback, AfterAllCallback, TestInstancePostProcessor { private SessionFactory sessionFactory; @@ -48,55 +44,19 @@ public class HibernateTestRunner extends BlockJUnit4ClassRunner { private boolean isDerby = false; - public HibernateTestRunner(Class klass) throws InitializationError { - super(klass); - } + private String previousMode; - @Override - protected List rules(Object test) { - assertThat(test instanceof HibernateTest) - .as( - "In order to use the %s for %s, it should (directly or indirectly) implement %s" - .formatted( - HibernateTestRunner.class.getSimpleName(), - test.getClass(), - HibernateTest.class)) - .isTrue(); - - var rules = super.rules(test); - rules.add( - new MethodRule() { - @Override - public Statement apply( - final Statement base, FrameworkMethod method, final Object target) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - ((HibernateTest) target).setSession(session); - base.evaluate(); - } - }; - } - }); - return rules; - } + private Target previousTarget; @Override - public void run(final RunNotifier notifier) { - try { - start(); - super.run(notifier); - } catch (Exception e) { - e.printStackTrace(); - var failure = - new Failure(Description.createSuiteDescription(getTestClass().getJavaClass()), e); - notifier.fireTestFailure(failure); - } finally { - shutdown(); - } - } + public void beforeAll(ExtensionContext context) throws Exception { + // Mode.mode/target are ThreadLocals shared across the @Nested suites that run on the same + // thread. Remember the values set by the enclosing suite so they can be restored in afterAll, + // otherwise this extension would leak HSQLDB into sibling (e.g. H2/Derby) JPA suites and make + // @IncludeIn/@ExcludeIn evaluate against the wrong target. + previousMode = Mode.mode.get(); + previousTarget = Mode.target.get(); - private void start() throws Exception { Mode.mode.set("hsqldb"); Mode.target.set(Target.HSQLDB); @@ -110,7 +70,7 @@ private void start() throws Exception { Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getDeclaredConstructor().newInstance(); } var props = new Properties(); - var is = HibernateTestRunner.class.getResourceAsStream(mode); + var is = HibernateTestExtension.class.getResourceAsStream(mode); if (is == null) { throw new IllegalArgumentException("No configuration available at classpath:" + mode); } @@ -123,6 +83,41 @@ private void start() throws Exception { session.beginTransaction(); } + @Override + public void postProcessTestInstance(Object testInstance, ExtensionContext context) { + if (!(testInstance instanceof HibernateTest hibernateTest)) { + throw new IllegalStateException( + "In order to use the %s for %s, it should (directly or indirectly) implement %s" + .formatted( + HibernateTestExtension.class.getSimpleName(), + testInstance.getClass(), + HibernateTest.class)); + } + hibernateTest.setSession(session); + } + + @Override + public void afterAll(ExtensionContext context) { + try { + shutdown(); + } finally { + restoreMode(); + } + } + + private void restoreMode() { + if (previousMode == null) { + Mode.mode.remove(); + } else { + Mode.mode.set(previousMode); + } + if (previousTarget == null) { + Mode.target.remove(); + } else { + Mode.target.set(previousTarget); + } + } + private void shutdown() { if (session != null) { try { diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestExtension.java similarity index 56% rename from querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java rename to querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestExtension.java index 176e6114cf..4a123d57e9 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestRunner.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/testutil/JPATestExtension.java @@ -13,8 +13,6 @@ */ package com.querydsl.jpa.testutil; -import static org.assertj.core.api.Assertions.assertThat; - import com.querydsl.jpa.JPATest; import com.querydsl.jpa.Mode; import jakarta.persistence.EntityManager; @@ -22,20 +20,18 @@ import jakarta.persistence.Persistence; import java.sql.DriverManager; import java.sql.SQLException; -import java.util.List; -import org.junit.rules.MethodRule; -import org.junit.runner.Description; -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunNotifier; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.extension.AfterAllCallback; +import org.junit.jupiter.api.extension.BeforeAllCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstancePostProcessor; /** - * @author tiwe + * JUnit 5 replacement for the former {@code JPATestRunner}. Creates a single {@link + * EntityManagerFactory}/{@link EntityManager} (with an open transaction) per test class, injects + * the entity manager into every {@link JPATest} instance and rolls everything back afterwards. */ -public class JPATestRunner extends BlockJUnit4ClassRunner { +public class JPATestExtension + implements BeforeAllCallback, AfterAllCallback, TestInstancePostProcessor { private EntityManagerFactory entityManagerFactory; @@ -43,52 +39,8 @@ public class JPATestRunner extends BlockJUnit4ClassRunner { private boolean isDerby; - public JPATestRunner(Class klass) throws InitializationError { - super(klass); - } - @Override - protected List rules(Object test) { - assertThat(test instanceof JPATest) - .as( - "In order to use the %s for %s, it should (directly or indirectly) implement %s" - .formatted(JPATestRunner.class.getSimpleName(), test.getClass(), JPATest.class)) - .isTrue(); - - var rules = super.rules(test); - rules.add( - new MethodRule() { - @Override - public Statement apply( - final Statement base, FrameworkMethod method, final Object target) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - ((JPATest) target).setEntityManager(entityManager); - base.evaluate(); - } - }; - } - }); - return rules; - } - - @Override - public void run(final RunNotifier notifier) { - try { - start(); - super.run(notifier); - } catch (Exception e) { - e.printStackTrace(); - var failure = - new Failure(Description.createSuiteDescription(getTestClass().getJavaClass()), e); - notifier.fireTestFailure(failure); - } finally { - shutdown(); - } - } - - private void start() throws Exception { + public void beforeAll(ExtensionContext context) throws Exception { var mode = Mode.mode.get(); if (mode == null) { mode = "h2perf"; @@ -103,6 +55,22 @@ private void start() throws Exception { entityManager.getTransaction().begin(); } + @Override + public void postProcessTestInstance(Object testInstance, ExtensionContext context) { + if (!(testInstance instanceof JPATest jpaTest)) { + throw new IllegalStateException( + "In order to use the %s for %s, it should (directly or indirectly) implement %s" + .formatted( + JPATestExtension.class.getSimpleName(), testInstance.getClass(), JPATest.class)); + } + jpaTest.setEntityManager(entityManager); + } + + @Override + public void afterAll(ExtensionContext context) { + shutdown(); + } + private void shutdown() { if (entityManager != null) { try { diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/META-INF/persistence.xml b/querydsl-libraries/querydsl-jpa/src/test/resources/META-INF/persistence.xml index 06c5f59c47..90b282ba57 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/META-INF/persistence.xml +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/META-INF/persistence.xml @@ -220,7 +220,7 @@ org.hibernate.jpa.HibernatePersistenceProvider - + @@ -251,7 +251,7 @@ org.hibernate.jpa.HibernatePersistenceProvider - + @@ -269,7 +269,7 @@ org.hibernate.jpa.HibernatePersistenceProvider - + @@ -302,7 +302,7 @@ - + diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties index b7b0002044..55f76364fa 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mssql.properties @@ -1,5 +1,5 @@ ## MSSQL -hibernate.dialect=com.querydsl.jpa.support.QSQLServer2008Dialect +hibernate.dialect=com.querydsl.jpa.support.QSQLServerDialect hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=tempdb;sendTimeAsDatetime=false;trustServerCertificate=true hibernate.connection.username=sa diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties index 619988c92f..5c958cf992 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/mysql.properties @@ -1,5 +1,5 @@ ## MySQL -hibernate.dialect=com.querydsl.jpa.support.QMySQL5InnoDBDialect +hibernate.dialect=com.querydsl.jpa.support.QMySQLDialect hibernate.connection.driver_class=com.mysql.jdbc.Driver hibernate.connection.url=jdbc:mysql://localhost:3306/querydsl hibernate.connection.username=querydsl diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties index f577ff1f06..341c14523e 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/oracle.properties @@ -2,7 +2,7 @@ #hibernate.dialect=org.hibernate.dialect.Oracle10gDialect hibernate.dialect=com.querydsl.jpa.support.QOracleDialect hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver -hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:xe +hibernate.connection.url=jdbc:oracle:thin:@localhost:1521/XEPDB1 hibernate.connection.username=querydsl hibernate.connection.password=querydsl diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties index 2f782835c7..04988564c3 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/com/querydsl/jpa/testutil/postgresql.properties @@ -1,5 +1,5 @@ ## MySQL -hibernate.dialect=com.querydsl.jpa.support.QPostgreSQL9Dialect +hibernate.dialect=com.querydsl.jpa.support.QPostgreSQLDialect hibernate.connection.driver_class=org.postgresql.Driver hibernate.connection.url=jdbc:postgresql://localhost:5432/querydsl hibernate.connection.username=querydsl diff --git a/querydsl-libraries/querydsl-jpa/src/test/resources/hibernate.cfg.xml b/querydsl-libraries/querydsl-jpa/src/test/resources/hibernate.cfg.xml index 77f0d8b63b..8a0f405242 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/resources/hibernate.cfg.xml +++ b/querydsl-libraries/querydsl-jpa/src/test/resources/hibernate.cfg.xml @@ -5,7 +5,7 @@ - com.querydsl.jpa.support.ExtendedDerbyDialect + com.querydsl.jpa.support.QDerbyDialect org.apache.derby.jdbc.EmbeddedDriver jdbc:derby:target/derbydb;create=true diff --git a/querydsl-libraries/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt b/querydsl-libraries/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt index ece4ab4de5..5e14a1ce2d 100644 --- a/querydsl-libraries/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt +++ b/querydsl-libraries/querydsl-kotlin/src/test/kotlin/com/querydsl/kotlin/CollectionTest.kt @@ -15,7 +15,7 @@ package com.querydsl.kotlin import com.querydsl.core.types.dsl.* -import org.junit.Test +import org.junit.jupiter.api.Test import java.math.BigDecimal import kotlin.test.assertEquals diff --git a/querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java b/querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java index d91bb77f90..62161fe595 100644 --- a/querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java +++ b/querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java @@ -23,7 +23,6 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import org.junit.jupiter.api.Test; @@ -51,10 +50,7 @@ private void verify(File oneJar) throws Exception { oneJarClassLoader.loadClass(MorphiaAnnotationProcessor.class.getName()); // querydsl-apt cl.getDeclaredConstructor().newInstance(); var resourceKey = "META-INF/services/javax.annotation.processing.Processor"; - assertThat( - new String( - Files.readAllBytes(Path.of(oneJarClassLoader.findResource(resourceKey).toURI())), - StandardCharsets.UTF_8)) + assertThat(Files.readString(Path.of(oneJarClassLoader.findResource(resourceKey).toURI()))) .isEqualTo(MorphiaAnnotationProcessor.class.getName()); } } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractBaseTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractBaseTest.java index 43c31b564f..1d7a2d3c2f 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractBaseTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractBaseTest.java @@ -26,13 +26,11 @@ import io.r2dbc.spi.Connection; import java.util.List; import org.jetbrains.annotations.Nullable; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.rules.MethodRule; -import org.junit.rules.TestRule; +import org.junit.jupiter.api.extension.ExtendWith; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +@ExtendWith({TargetExtension.class, SkipForQuotedExtension.class}) public abstract class AbstractBaseTest { // protected static final Logger logger = LoggerFactory.getLogger(AbstractBaseTest.class); @@ -77,10 +75,6 @@ public TestQuery clone(Connection conn) { @Nullable protected String expectedQuery; - @Rule public MethodRule skipForQuotedRule = new SkipForQuotedRule(configuration); - - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - protected void add(List list, T arg, Target... exclusions) { if (exclusions.length > 0) { for (Target t : exclusions) { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractSQLTemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractSQLTemplatesTest.java index a75550d50d..b9ea3ae520 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractSQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/AbstractSQLTemplatesTest.java @@ -25,8 +25,8 @@ import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.r2dbc.domain.QSurvey; import java.util.Collection; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class AbstractSQLTemplatesTest { @@ -40,7 +40,7 @@ public abstract class AbstractSQLTemplatesTest { protected abstract SQLTemplates createTemplates(); - @Before + @BeforeEach public void setUp() { templates = createTemplates(); templates.newLineToSingleSpace(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/BeanPopulationBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/BeanPopulationBase.java index 3190a4c5f8..2da572b2f4 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/BeanPopulationBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/BeanPopulationBase.java @@ -27,15 +27,15 @@ import com.querydsl.r2dbc.dml.BeanMapper; import com.querydsl.r2dbc.domain.Employee; import com.querydsl.r2dbc.domain.QEmployee; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; @ExcludeIn({CUBRID, DB2, DERBY, ORACLE, SQLSERVER, POSTGRESQL, SQLITE, TERADATA}) public abstract class BeanPopulationBase extends AbstractBaseTest { private final QEmployee e = new QEmployee("e"); - @After + @AfterEach public void tearDown() { delete(e).where(e.firstname.eq("John")).execute().block(); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/CoalesceTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/CoalesceTest.java index 98f845a471..d9df23cd18 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/CoalesceTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/CoalesceTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.Coalesce; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CoalesceTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ColumnMetadataTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ColumnMetadataTest.java index f3eaf42a1c..71ba0a912d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ColumnMetadataTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ColumnMetadataTest.java @@ -5,7 +5,7 @@ import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.sql.ColumnMetadata; import java.sql.Types; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ColumnMetadataTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ConfigurationTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ConfigurationTest.java index 2a20c8de94..ff474323fe 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ConfigurationTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ConfigurationTest.java @@ -14,6 +14,7 @@ package com.querydsl.r2dbc; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.alias.Gender; import com.querydsl.r2dbc.binding.BindTarget; @@ -35,7 +36,7 @@ import java.sql.Types; import java.util.Locale; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConfigurationTest { @@ -145,14 +146,22 @@ public void columnOverride() { .isEqualTo("lower"); } - @Test(expected = NullPointerException.class) + @Test public void npeWithNullParameterOfChainedNameMappingConstructor() { - new ChainedNameMapping((NameMapping[]) null); + assertThatThrownBy( + () -> { + new ChainedNameMapping((NameMapping[]) null); + }) + .isInstanceOf(NullPointerException.class); } - @Test(expected = NullPointerException.class) + @Test public void npeWithNullElementInParameterOfChainedNameMappingConstructor() { - new ChainedNameMapping(new NameMapping[] {null}); + assertThatThrownBy( + () -> { + new ChainedNameMapping(new NameMapping[] {null}); + }) + .isInstanceOf(NullPointerException.class); } @Test diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DateArithmeticTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DateArithmeticTest.java index 9a9496a555..67763c7231 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DateArithmeticTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DateArithmeticTest.java @@ -1,16 +1,15 @@ package com.querydsl.r2dbc; -import com.querydsl.core.testutil.ReportingOnly; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.DateTimePath; import com.querydsl.core.types.dsl.Expressions; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(ReportingOnly.class) +@Tag("com.querydsl.core.testutil.ReportingOnly") public class DateArithmeticTest { private String serialize(Expression expr, SQLTemplates templates) { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DeleteBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DeleteBase.java index 1c7527271d..aba953642b 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DeleteBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DeleteBase.java @@ -26,9 +26,9 @@ import com.querydsl.core.types.dsl.Param; import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class DeleteBase extends AbstractBaseTest { @@ -37,12 +37,12 @@ private void reset() { insert(survey).values(1, "Hello World", "Hello").execute().block(); } - @Before + @BeforeEach public void setUp() { reset(); } - @After + @AfterEach public void tearDown() { reset(); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DependenciesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DependenciesTest.java index 30341a501d..35a99a4547 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DependenciesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/DependenciesTest.java @@ -17,13 +17,13 @@ import java.io.IOException; import jdepend.framework.JDepend; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class DependenciesTest { @Test - @Ignore + @Disabled public void test() throws IOException { var jdepend = new JDepend(); jdepend.addDirectory("target/classes/com/querydsl/r2dbc"); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ExtendedSQLTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ExtendedSQLTest.java index 8fa0012787..0226e55ead 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ExtendedSQLTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ExtendedSQLTest.java @@ -12,7 +12,7 @@ import com.querydsl.sql.ColumnMetadata; import com.querydsl.sql.RelationalPathBase; import java.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExtendedSQLTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ForeignKeyTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ForeignKeyTest.java index 5b5fb990a4..d124cdadd8 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ForeignKeyTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ForeignKeyTest.java @@ -19,7 +19,7 @@ import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.sql.ForeignKey; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ForeignKeyTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/H2TemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/H2TemplatesTest.java index e44aef1297..0e4e4da33d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/H2TemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/H2TemplatesTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class H2TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/InsertBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/InsertBase.java index 75efa7e2ea..cbb05d03f2 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/InsertBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/InsertBase.java @@ -27,6 +27,7 @@ import static com.querydsl.r2dbc.Constants.survey; import static com.querydsl.r2dbc.Constants.survey2; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.QueryException; import com.querydsl.core.QueryFlag.Position; @@ -46,9 +47,9 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.UUID; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class InsertBase extends AbstractBaseTest { @@ -59,12 +60,12 @@ private void reset() { delete(QDateTest.qDateTest).execute().block(); } - @Before + @BeforeEach public void setUp() { reset(); } - @After + @AfterEach public void tearDown() { reset(); } @@ -182,21 +183,31 @@ public void insert_with_keys_Projected2() { assertThat(id).isNotNull(); } - @Test(expected = QueryException.class) + @Test @IncludeIn({DERBY, HSQLDB}) public void insert_with_keys_OverriddenColumn() { - var originalColumnName = ColumnMetadata.getName(survey.id); - try { - configuration.registerColumnOverride( - survey.getSchemaName(), survey.getTableName(), originalColumnName, "wrongColumnName"); - - var insert = new R2DBCInsertClause(connection, configuration, survey); - Object id = insert.set(survey.name, "Hello you").executeWithKey(survey.id); - assertThat(id).isNotNull(); - } finally { - configuration.registerColumnOverride( - survey.getSchemaName(), survey.getTableName(), originalColumnName, originalColumnName); - } + assertThatThrownBy( + () -> { + var originalColumnName = ColumnMetadata.getName(survey.id); + try { + configuration.registerColumnOverride( + survey.getSchemaName(), + survey.getTableName(), + originalColumnName, + "wrongColumnName"); + + var insert = new R2DBCInsertClause(connection, configuration, survey); + Object id = insert.set(survey.name, "Hello you").executeWithKey(survey.id); + assertThat(id).isNotNull(); + } finally { + configuration.registerColumnOverride( + survey.getSchemaName(), + survey.getTableName(), + originalColumnName, + originalColumnName); + } + }) + .isInstanceOf(QueryException.class); } // http://sourceforge.net/tracker/index.php?func=detail&aid=3513432&group_id=280608&atid=2377440 diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JDBCTypeMappingTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JDBCTypeMappingTest.java index 01c46ed3e8..346ed3491d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JDBCTypeMappingTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JDBCTypeMappingTest.java @@ -15,13 +15,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.ReportingOnly; import io.r2dbc.spi.Blob; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Types; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; public class JDBCTypeMappingTest { @@ -83,7 +82,7 @@ public void numericTypes() { } @Test - @Category(ReportingOnly.class) + @Tag("com.querydsl.core.testutil.ReportingOnly") public void max() { System.err.println("Byte: " + String.valueOf(Byte.MAX_VALUE).length()); System.err.println("Short: " + String.valueOf(Short.MAX_VALUE).length()); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JavaTypeMappingTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JavaTypeMappingTest.java index 04d719bc57..2864b9200c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JavaTypeMappingTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JavaTypeMappingTest.java @@ -28,7 +28,7 @@ import com.querydsl.r2dbc.types.ShortType; import java.io.FileInputStream; import java.io.InputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JavaTypeMappingTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinFlagsTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinFlagsTest.java index 105f9cc26d..2e171154e2 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinFlagsTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinFlagsTest.java @@ -19,8 +19,8 @@ import com.querydsl.r2dbc.domain.QSurvey; import io.r2dbc.spi.Connection; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JoinFlagsTest { @@ -31,7 +31,7 @@ public class JoinFlagsTest { private R2DBCQuery query; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { s1 = new QSurvey("s"); s2 = new QSurvey("s2"); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinUsageTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinUsageTest.java index 9d2e2d2bd4..dbc0e3b051 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinUsageTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/JoinUsageTest.java @@ -13,16 +13,22 @@ */ package com.querydsl.r2dbc; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class JoinUsageTest { - @Test(expected = IllegalStateException.class) - @Ignore + @Test + @Disabled public void join_already_declared() { - var survey = QSurvey.survey; - R2DBCExpressions.selectFrom(survey).fullJoin(survey); + assertThatThrownBy( + () -> { + var survey = QSurvey.survey; + R2DBCExpressions.selectFrom(survey).fullJoin(survey); + }) + .isInstanceOf(IllegalStateException.class); } } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyAccessorsTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyAccessorsTest.java index 9498571543..e9badad6c2 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyAccessorsTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyAccessorsTest.java @@ -22,7 +22,7 @@ import com.querydsl.sql.PrimaryKey; import com.querydsl.sql.RelationalPathBase; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeyAccessorsTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyTest.java index 96a61acc52..788862f1d6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeyTest.java @@ -19,7 +19,7 @@ import com.querydsl.sql.ForeignKey; import com.querydsl.sql.PrimaryKey; import com.querydsl.sql.RelationalPathBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("serial") public class KeyTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeywordQuotingBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeywordQuotingBase.java index ae8949f9a4..9fd8746ac1 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeywordQuotingBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/KeywordQuotingBase.java @@ -25,9 +25,9 @@ import com.querydsl.r2dbc.ddl.DropTableClause; import com.querydsl.sql.ColumnMetadata; import com.querydsl.sql.RelationalPathBase; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class KeywordQuotingBase extends AbstractBaseTest { @@ -56,7 +56,7 @@ protected void addMetadata() { private final Quoting quoting = Quoting.quoting; - @Before + @BeforeEach public void setUp() throws Exception { new CreateTableClause(connection, configuration, "quoting") .column("from", String.class) @@ -67,7 +67,7 @@ public void setUp() throws Exception { execute(insert(quoting).columns(quoting.from, quoting.all).values("from", true)).block(); } - @After + @AfterEach public void tearDown() throws Exception { new DropTableClause(connection, configuration, "quoting").execute().block(); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/LikeEscapeBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/LikeEscapeBase.java index 96fb0b1b5d..1b8d01e960 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/LikeEscapeBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/LikeEscapeBase.java @@ -16,13 +16,13 @@ import static com.querydsl.r2dbc.Constants.survey; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class LikeEscapeBase extends AbstractBaseTest { - @Before + @BeforeEach public void setUp() { delete(survey).execute().block(); insert(survey) @@ -34,7 +34,7 @@ public void setUp() { .block(); } - @After + @AfterEach public void tearDown() { delete(survey).execute().block(); insert(survey).values(1, "Hello World", "Hello").execute().block(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ListSubQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ListSubQueryTest.java index f05603e527..716c22c020 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ListSubQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/ListSubQueryTest.java @@ -8,7 +8,7 @@ import com.querydsl.r2dbc.domain.QSurvey; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ListSubQueryTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MetadataTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MetadataTest.java index 54de5f54f4..01a376c774 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MetadataTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MetadataTest.java @@ -1,9 +1,9 @@ package com.querydsl.r2dbc; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class MetadataTest { // H2 diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MultikeyTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MultikeyTest.java index ea6f1469fd..87a04b044c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MultikeyTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MultikeyTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MultikeyTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MySQLTemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MySQLTemplatesTest.java index a672fc8329..5b53adc3c6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MySQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/MySQLTemplatesTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MySQLTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PaginationTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PaginationTest.java index ccb60f7dbd..898795f1ec 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PaginationTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PaginationTest.java @@ -3,14 +3,13 @@ import com.querydsl.core.QueryMetadata; import com.querydsl.core.QueryModifiers; import com.querydsl.core.support.QueryMixin; -import com.querydsl.core.testutil.ReportingOnly; import com.querydsl.r2dbc.domain.QEmployee; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(ReportingOnly.class) +@Tag("com.querydsl.core.testutil.ReportingOnly") public class PaginationTest { private String serialize(QueryMetadata metadata, SQLTemplates templates) { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PostgreSQLTemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PostgreSQLTemplatesTest.java index 61c0b202f0..e57ec1e070 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PostgreSQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PostgreSQLTemplatesTest.java @@ -18,7 +18,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PostgreSQLTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PrecedenceTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PrecedenceTest.java index cf8e9d513a..0349605370 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PrecedenceTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/PrecedenceTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PrecedenceTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBean2Test.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBean2Test.java index 2cb7368163..8d8488db79 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBean2Test.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBean2Test.java @@ -24,7 +24,7 @@ import com.querydsl.core.types.dsl.StringPath; import com.querydsl.sql.ColumnMetadata; import com.querydsl.sql.RelationalPathBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QBean2Test { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBeanTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBeanTest.java index 8c3fa28c92..9ce8a05f4d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBeanTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QBeanTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Projections; import com.querydsl.r2dbc.domain.Employee; import com.querydsl.r2dbc.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QBeanTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QPersonTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QPersonTest.java index 52857090b6..b8b2aa997c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QPersonTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QPersonTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.QBean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QPersonTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QueryPerformanceTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QueryPerformanceTest.java index 4e08ce2576..bd13429cab 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QueryPerformanceTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/QueryPerformanceTest.java @@ -5,15 +5,13 @@ import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.JoinType; import com.querydsl.core.QueryMetadata; -import com.querydsl.core.testutil.H2; -import com.querydsl.core.testutil.Performance; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; @@ -23,8 +21,9 @@ import org.openjdk.jmh.runner.options.TimeValue; import reactor.core.publisher.Mono; -@Category({H2.class, Performance.class}) -@Ignore( +@Tag("com.querydsl.core.testutil.H2") +@Tag("com.querydsl.core.testutil.Performance") +@Disabled( """ currently R2DBC has known READ performance issues - also there is a bug in the tests\ somewhere\ @@ -42,7 +41,7 @@ public class QueryPerformanceTest { private static final Configuration conf = new Configuration(templates); - @BeforeClass + @BeforeAll public static void setUpClass() { Connections.initH2(); var conn = Connections.getConnection(); @@ -61,7 +60,7 @@ public static void setUpClass() { conn.setAutoCommit(false); } - @AfterClass + @AfterAll public static void tearDownClass() { var conn = Connections.getConnection(); var stmt = conn.createStatement("drop table companies"); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryFactoryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryFactoryTest.java index b27d8913bf..b4f40e74ed 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryFactoryTest.java @@ -18,15 +18,15 @@ import com.querydsl.r2dbc.domain.QSurvey; import io.r2dbc.spi.Connection; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; public class R2DBCQueryFactoryTest { private R2DBCQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { R2DBCConnectionProvider provider = () -> Mono.just(EasyMock.createNiceMock(Connection.class)); queryFactory = new R2DBCQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryTest.java index df16264818..2759dd0247 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCQueryTest.java @@ -1,13 +1,19 @@ package com.querydsl.r2dbc; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class R2DBCQueryTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var survey = QSurvey.survey; - R2DBCExpressions.select(survey.id).from(survey).fetch().collectList().block(); + assertThatThrownBy( + () -> { + var survey = QSurvey.survey; + R2DBCExpressions.select(survey.id).from(survey).fetch().collectList().block(); + }) + .isInstanceOf(IllegalStateException.class); } } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCRelationalFunctionCallTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCRelationalFunctionCallTest.java index 4072d95acd..29a107c8f5 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCRelationalFunctionCallTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/R2DBCRelationalFunctionCallTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.PathBuilder; import com.querydsl.core.types.dsl.StringPath; import com.querydsl.sql.RelationalFunctionCall; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class R2DBCRelationalFunctionCallTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathExtractorTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathExtractorTest.java index 4c17ba3ca4..aeb11a4873 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathExtractorTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathExtractorTest.java @@ -7,7 +7,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.sql.RelationalPathExtractor; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalPathExtractorTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathTest.java index 143052fbaa..1fc513c41f 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/RelationalPathTest.java @@ -7,7 +7,7 @@ import com.querydsl.r2dbc.domain.QSurvey; import java.io.IOException; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalPathTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLBindingsTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLBindingsTest.java index 4c41e6d622..524a80a863 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLBindingsTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLBindingsTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.dsl.Param; import com.querydsl.r2dbc.domain.QSurvey; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLBindingsTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSerializerTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSerializerTest.java index db00ad0e6e..6d811dcda4 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSerializerTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSerializerTest.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.TimeZone; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLSerializerTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2005TemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2005TemplatesTest.java index ef915a5faa..73d8ccf3a9 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2005TemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2005TemplatesTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.sql.SQLOps; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServer2005TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2012TemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2012TemplatesTest.java index d76bece5eb..ac33072f46 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2012TemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServer2012TemplatesTest.java @@ -23,7 +23,7 @@ import com.querydsl.r2dbc.dml.R2DBCDeleteClause; import com.querydsl.r2dbc.dml.R2DBCUpdateClause; import com.querydsl.sql.SQLOps; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServerTemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServerTemplatesTest.java index a1f7a9304a..7c09f18d38 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServerTemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLServerTemplatesTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.sql.SQLOps; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServerTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSubQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSubQueryTest.java index b3505284fc..519f887ef4 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSubQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLSubQueryTest.java @@ -14,6 +14,7 @@ package com.querydsl.r2dbc; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.Expression; @@ -26,33 +27,37 @@ import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.r2dbc.domain.QSurvey; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLSubQueryTest { private static final QEmployee employee = QEmployee.employee; - @Test(expected = IllegalArgumentException.class) + @Test public void unknownOperator() { - Operator op = - new Operator() { - @Override - public String name() { - return "unknownfn"; - } - - @Override - public String toString() { - return name(); - } - - @Override - public Class getType() { - return Object.class; - } - }; - R2DBCQuery query = new R2DBCQuery(); - query.from(employee).where(Expressions.booleanOperation(op, employee.id)).toString(); + assertThatThrownBy( + () -> { + Operator op = + new Operator() { + @Override + public String name() { + return "unknownfn"; + } + + @Override + public String toString() { + return name(); + } + + @Override + public Class getType() { + return Object.class; + } + }; + R2DBCQuery query = new R2DBCQuery(); + query.from(employee).where(Expressions.booleanOperation(op, employee.id)).toString(); + }) + .isInstanceOf(IllegalArgumentException.class); } @SuppressWarnings("unchecked") diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTemplatesTest.java index 973716027e..dc7036dbd4 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTemplatesTest.java @@ -29,7 +29,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTypeMappingTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTypeMappingTest.java index a8e56ed6b5..7d6130f414 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTypeMappingTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SQLTypeMappingTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.fail; import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLTypeMappingTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SchemaAndTableTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SchemaAndTableTest.java index 07a8bbfa7f..32d16c0375 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SchemaAndTableTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SchemaAndTableTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.sql.SchemaAndTable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SchemaAndTableTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java index 3bd38cd34c..8815f5bff6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectBase.java @@ -33,6 +33,7 @@ import static com.querydsl.r2dbc.Constants.survey2; import static com.querydsl.r2dbc.Constants.time; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -100,8 +101,8 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class SelectBase extends AbstractBaseTest { @@ -303,7 +304,7 @@ public void array2() { @Test @ExcludeIn({DERBY, HSQLDB}) - @Ignore("currently not supported by drivers") + @Disabled("currently not supported by drivers") public void array_null() { Expression expr = Expressions.template(Integer[].class, "null"); assertThat(firstResult(expr)).isNull(); @@ -676,7 +677,7 @@ public void dates() { } @Test - @Ignore // FIXME + @Disabled // FIXME @ExcludeIn({CUBRID, DB2, DERBY, HSQLDB, POSTGRESQL, SQLITE, TERADATA}) public void dates_cST() { var tz = TimeZone.getDefault(); @@ -689,7 +690,7 @@ public void dates_cST() { } @Test - @Ignore // FIXME + @Disabled // FIXME @ExcludeIn({CUBRID, DB2, DERBY, HSQLDB, POSTGRESQL, SQLITE, TERADATA}) public void dates_iOT() { var tz = TimeZone.getDefault(); @@ -1100,11 +1101,16 @@ public void groupBy_validate() { } @SuppressWarnings("unchecked") - @Test(expected = IllegalArgumentException.class) + @Test public void illegalUnion() { - SubQueryExpression sq1 = query().from(employee).select(employee.id.max()); - SubQueryExpression sq2 = query().from(employee).select(employee.id.max()); - assertEquals(0, query().from(employee).union(sq1, sq2).fetch().collectList().block().size()); + assertThatThrownBy( + () -> { + SubQueryExpression sq1 = query().from(employee).select(employee.id.max()); + SubQueryExpression sq2 = query().from(employee).select(employee.id.max()); + assertEquals( + 0, query().from(employee).union(sq1, sq2).fetch().collectList().block().size()); + }) + .isInstanceOf(IllegalArgumentException.class); } @Test @@ -1668,7 +1674,7 @@ public void number_as_boolean() { } @Test - @Ignore("not valid as streams cannot have nulls") + @Disabled("not valid as streams cannot have nulls") public void number_as_boolean_Null() { var numberTest = QNumberTest.numberTest; delete(numberTest).execute().block(); @@ -1790,17 +1796,21 @@ public void params_anon() { .block()); } - @Test(expected = ParamNotSetException.class) + @Test public void params_not_set() { - var name = new Param(String.class, "name"); - assertEquals( - "Mike", - query() - .from(employee) - .where(employee.firstname.eq(name)) - .select(employee.firstname) - .fetchFirst() - .block()); + assertThatThrownBy( + () -> { + var name = new Param(String.class, "name"); + assertEquals( + "Mike", + query() + .from(employee) + .where(employee.firstname.eq(name)) + .select(employee.firstname) + .fetchFirst() + .block()); + }) + .isInstanceOf(ParamNotSetException.class); } @Test @@ -2049,7 +2059,7 @@ public void rpad() { } @Test - @Ignore + @Disabled @ExcludeIn({ORACLE, DERBY, SQLSERVER}) public void select_booleanExpr() { // TODO : FIXME @@ -2057,7 +2067,7 @@ public void select_booleanExpr() { } @Test - @Ignore + @Disabled @ExcludeIn({ORACLE, DERBY, SQLSERVER}) public void select_booleanExpr2() { // TODO : FIXME @@ -2518,10 +2528,14 @@ public void unique_wildcard() { assertThat(row.get(1, Object.class)).as(row.get(0, Object.class) + " is not null").isNotNull(); } - @Ignore("we select the first result if one selected") - @Test(expected = NonUniqueResultException.class) + @Disabled("we select the first result if one selected") + @Test public void uniqueResultContract() { - query().from(employee).select(employee.all()).fetchOne().block(); + assertThatThrownBy( + () -> { + query().from(employee).select(employee.all()).fetchOne().block(); + }) + .isInstanceOf(NonUniqueResultException.class); } @Test diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectMySQLBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectMySQLBase.java index e5e12e811b..278f9f6fa0 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectMySQLBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectMySQLBase.java @@ -5,7 +5,7 @@ import com.querydsl.core.testutil.IncludeIn; import com.querydsl.r2dbc.mysql.R2DBCMySQLQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SelectMySQLBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectWindowFunctionsBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectWindowFunctionsBase.java index 42174ead84..933b1fa43e 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectWindowFunctionsBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SelectWindowFunctionsBase.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SelectWindowFunctionsBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SerializationTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SerializationTest.java index 4275e593da..95e9fe6c34 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SerializationTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SerializationTest.java @@ -26,7 +26,7 @@ import com.querydsl.r2dbc.domain.QSurvey; import io.r2dbc.spi.Connection; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SerializationTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedExtension.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedExtension.java new file mode 100644 index 0000000000..ced1128def --- /dev/null +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedExtension.java @@ -0,0 +1,30 @@ +package com.querydsl.r2dbc; + +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code SkipForQuotedRule}. Disables test methods annotated + * with {@link SkipForQuoted} when the active configuration uses quoting, schema printing or + * literals. + */ +public class SkipForQuotedExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var testMethod = context.getTestMethod().orElse(null); + if (testMethod == null || !testMethod.isAnnotationPresent(SkipForQuoted.class)) { + return ConditionEvaluationResult.enabled("No @SkipForQuoted"); + } + var configuration = Connections.getConfiguration(); + if (configuration == null) { + return ConditionEvaluationResult.enabled("No configuration"); + } + var templates = configuration.getTemplates(); + if (templates.isUseQuotes() || templates.isPrintSchema() || configuration.getUseLiterals()) { + return ConditionEvaluationResult.disabled("Skipped for quoted templates"); + } + return ConditionEvaluationResult.enabled("Not quoted"); + } +} diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedRule.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedRule.java deleted file mode 100644 index e19cbf3207..0000000000 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SkipForQuotedRule.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.querydsl.r2dbc; - -import com.querydsl.core.testutil.EmptyStatement; -import org.junit.rules.MethodRule; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.Statement; - -public class SkipForQuotedRule implements MethodRule { - - private final Configuration configuration; - - public SkipForQuotedRule(Configuration conf) { - this.configuration = conf; - } - - @Override - public Statement apply(Statement base, FrameworkMethod method, Object target) { - var templates = configuration.getTemplates(); - if (templates.isUseQuotes() || templates.isPrintSchema() || configuration.getUseLiterals()) { - var skip = method.getMethod().isAnnotationPresent(SkipForQuoted.class); - return skip ? EmptyStatement.DEFAULT : base; - } else { - return base; - } - } -} diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SubqueriesBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SubqueriesBase.java index 1bedfcb069..d83e63988d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SubqueriesBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/SubqueriesBase.java @@ -29,7 +29,7 @@ import com.querydsl.sql.ForeignKey; import java.math.BigDecimal; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SubqueriesBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetExtension.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetExtension.java new file mode 100644 index 0000000000..e2dadb326d --- /dev/null +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetExtension.java @@ -0,0 +1,39 @@ +package com.querydsl.r2dbc; + +import com.querydsl.core.Target; +import com.querydsl.core.testutil.ExcludeIn; +import com.querydsl.core.testutil.IncludeIn; +import java.util.Arrays; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code TargetRule}. Disables a test (or container) when the + * configured {@link Target} is excluded via {@link ExcludeIn} or not part of {@link IncludeIn}. + */ +public class TargetExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var target = Connections.getTarget(); + if (target == null) { + return ConditionEvaluationResult.enabled("No target configured"); + } + var element = context.getElement().orElse(null); + if (element == null) { + return ConditionEvaluationResult.enabled("No annotated element"); + } + // excluded in given targets + var ex = element.getAnnotation(ExcludeIn.class); + if (ex != null && Arrays.asList(ex.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Excluded in target " + target); + } + // included only in given targets + var in = element.getAnnotation(IncludeIn.class); + if (in != null && !Arrays.asList(in.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Not included in target " + target); + } + return ConditionEvaluationResult.enabled("Enabled for target " + target); + } +} diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetRule.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetRule.java deleted file mode 100644 index 3f40a3cb6e..0000000000 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TargetRule.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.querydsl.r2dbc; - -import com.querydsl.core.Target; -import com.querydsl.core.testutil.EmptyStatement; -import com.querydsl.core.testutil.ExcludeIn; -import com.querydsl.core.testutil.IncludeIn; -import java.util.Arrays; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -public class TargetRule implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - var target = Connections.getTarget(); - var run = target == null || isExecuted(description, target); - return run ? base : EmptyStatement.DEFAULT; - } - - private boolean isExecuted(Description description, Target target) { - var ex = description.getAnnotation(ExcludeIn.class); - // excluded in given targets - if (ex != null && Arrays.asList(ex.value()).contains(target)) { - return false; - } - // included only in given targets - var in = description.getAnnotation(IncludeIn.class); - return in == null || Arrays.asList(in.value()).contains(target); - } -} diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplateTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplateTest.java index 0d7ab2a1ec..58280140dd 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplateTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplateTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.StringExpression; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TemplateTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplatesTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplatesTest.java index faec9472d0..4acc9df0d6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplatesTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TemplatesTest.java @@ -14,7 +14,7 @@ package com.querydsl.r2dbc; import com.querydsl.core.TemplatesTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TemplatesTest extends TemplatesTestBase { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TypesBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TypesBase.java index ee009a7c63..826cc1a744 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TypesBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/TypesBase.java @@ -10,7 +10,7 @@ import java.math.BigInteger; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class TypesBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionBase.java index 7767d8d912..746b571f6e 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionBase.java @@ -19,8 +19,8 @@ import com.querydsl.r2dbc.domain.QEmployee; import java.io.IOException; import java.util.Arrays; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class UnionBase extends AbstractBaseTest { @@ -180,7 +180,7 @@ public void union4() { @SuppressWarnings("unchecked") @Test @ExcludeIn({DERBY, CUBRID, FIREBIRD, TERADATA}) - @Ignore // FIXME + @Disabled // FIXME 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) diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionSubQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionSubQueryTest.java index 8e71f29b6a..1e4271ea84 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionSubQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UnionSubQueryTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.core.types.dsl.SimpleExpression; import com.querydsl.core.types.dsl.SimplePath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnionSubQueryTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UpdateBase.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UpdateBase.java index 7363b96cc5..c5d8912181 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UpdateBase.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/UpdateBase.java @@ -32,9 +32,9 @@ import com.querydsl.r2dbc.domain.QSurvey; import java.util.Collections; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class UpdateBase extends AbstractBaseTest { @@ -43,12 +43,12 @@ protected void reset() { insert(survey).values(1, "Hello World", "Hello").execute().block(); } - @Before + @BeforeEach public void setUp() { reset(); } - @After + @AfterEach public void tearDown() { reset(); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WindowFunctionTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WindowFunctionTest.java index 2084a688ba..e6bdf34d1c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WindowFunctionTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WindowFunctionTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WindowFunctionTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WithinGroupTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WithinGroupTest.java index 850835b490..48afc535f2 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WithinGroupTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/WithinGroupTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WithinGroupTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AbstractMapperTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AbstractMapperTest.java index 9b7011c5bf..8a3e514a3a 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AbstractMapperTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AbstractMapperTest.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractMapperTest { @@ -49,7 +49,7 @@ public static class EmployeeNames { protected Employee employee; - @Before + @BeforeEach public void setUp() { employee = new Employee(); employee.setDatefield(new Date(0)); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AnnotationMapperTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AnnotationMapperTest.java index 5e4c9a73d4..f8d3bc9d40 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AnnotationMapperTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/AnnotationMapperTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.r2dbc.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnnotationMapperTest extends AbstractMapperTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/BeanMapperTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/BeanMapperTest.java index 1c8a509c17..4f0854a04f 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/BeanMapperTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/BeanMapperTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.r2dbc.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BeanMapperTest extends AbstractMapperTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCDeleteClauseTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCDeleteClauseTest.java index afa67c62d6..037f178150 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCDeleteClauseTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCDeleteClauseTest.java @@ -1,30 +1,39 @@ package com.querydsl.r2dbc.dml; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.r2dbc.KeyAccessorsTest.QEmployee; import com.querydsl.r2dbc.SQLTemplates; import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class R2DBCDeleteClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var delete = new R2DBCDeleteClause(null, SQLTemplates.DEFAULT, emp1); - delete.where(emp1.id.eq(1)); - delete.execute().block(); + assertThatThrownBy( + () -> { + var emp1 = new QEmployee("emp1"); + var delete = new R2DBCDeleteClause(null, SQLTemplates.DEFAULT, emp1); + delete.where(emp1.id.eq(1)); + delete.execute().block(); + }) + .isInstanceOf(IllegalStateException.class); } - @Test(expected = IllegalArgumentException.class) - @Ignore + @Test + @Disabled public void error() { - var emp1 = new QEmployee("emp1"); - var emp2 = new QEmployee("emp2"); - var delete = new R2DBCDeleteClause(null, SQLTemplates.DEFAULT, emp1); - delete.where(emp2.id.eq(1)); + assertThatThrownBy( + () -> { + var emp1 = new QEmployee("emp1"); + var emp2 = new QEmployee("emp2"); + var delete = new R2DBCDeleteClause(null, SQLTemplates.DEFAULT, emp1); + delete.where(emp2.id.eq(1)); + }) + .isInstanceOf(IllegalArgumentException.class); } @Test diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCInsertClauseTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCInsertClauseTest.java index a78e084f96..46dfe1eab8 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCInsertClauseTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCInsertClauseTest.java @@ -1,20 +1,25 @@ package com.querydsl.r2dbc.dml; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.r2dbc.KeyAccessorsTest.QEmployee; import com.querydsl.r2dbc.SQLTemplates; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class R2DBCInsertClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var insert = new R2DBCInsertClause(null, SQLTemplates.DEFAULT, emp1); - insert.set(emp1.id, 1); - insert.execute().block(); + assertThatThrownBy( + () -> { + var emp1 = new QEmployee("emp1"); + var insert = new R2DBCInsertClause(null, SQLTemplates.DEFAULT, emp1); + insert.set(emp1.id, 1); + insert.execute().block(); + }) + .isInstanceOf(IllegalStateException.class); } @Test diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCUpdateClauseTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCUpdateClauseTest.java index 8d44410483..235ba3935e 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCUpdateClauseTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/dml/R2DBCUpdateClauseTest.java @@ -1,21 +1,26 @@ package com.querydsl.r2dbc.dml; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.r2dbc.KeyAccessorsTest.QEmployee; import com.querydsl.r2dbc.R2DBCExpressions; import com.querydsl.r2dbc.SQLTemplates; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class R2DBCUpdateClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var update = new R2DBCUpdateClause(null, SQLTemplates.DEFAULT, emp1); - update.set(emp1.id, 1); - update.execute().block(); + assertThatThrownBy( + () -> { + var emp1 = new QEmployee("emp1"); + var update = new R2DBCUpdateClause(null, SQLTemplates.DEFAULT, emp1); + update.set(emp1.id, 1); + update.execute().block(); + }) + .isInstanceOf(IllegalStateException.class); } @Test diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/GeneratedKeysH2Test.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/GeneratedKeysH2Test.java index 25018cba85..4d09d40932 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/GeneratedKeysH2Test.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/GeneratedKeysH2Test.java @@ -22,22 +22,22 @@ import io.r2dbc.spi.Connection; import java.util.Collection; import java.util.Collections; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; public class GeneratedKeysH2Test { private Connection conn; - @Before + @BeforeEach public void setUp() { conn = Connections.getH2().getConnection().block(); } @Test - @Ignore("currently not supported") + @Disabled("currently not supported") public void test() { Mono.from(conn.createStatement("drop table GENERATED_KEYS if exists").execute()).block(); Mono.from( diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/H2QueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/H2QueryTest.java index aa8bcb2600..a0f08be613 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/H2QueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/h2/H2QueryTest.java @@ -3,8 +3,8 @@ import com.querydsl.r2dbc.H2Templates; import com.querydsl.r2dbc.R2DBCQuery; import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class H2QueryTest { @@ -12,7 +12,7 @@ public class H2QueryTest { private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new R2DBCQuery(H2Templates.builder().newLineToSingleSpace().build()); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/SQLServerQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/SQLServerQueryTest.java index f4e66f796a..25db6df188 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/SQLServerQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/SQLServerQueryTest.java @@ -18,7 +18,7 @@ import com.querydsl.r2dbc.SQLServerTemplates; import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServerQueryTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/WindowFunctionTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/WindowFunctionTest.java index 8ef8cb461e..e20d2aa3fa 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/WindowFunctionTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mssql/WindowFunctionTest.java @@ -21,7 +21,7 @@ import com.querydsl.r2dbc.R2DBCExpressions; import com.querydsl.r2dbc.SQLSerializer; import com.querydsl.r2dbc.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WindowFunctionTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/GeneratedKeysMySQLTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/GeneratedKeysMySQLTest.java index 768ebe7635..ed6a584a9a 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/GeneratedKeysMySQLTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/GeneratedKeysMySQLTest.java @@ -15,7 +15,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.MySQL; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.H2Templates; import com.querydsl.r2dbc.QGeneratedKeysEntity; @@ -23,24 +22,24 @@ import io.r2dbc.spi.Connection; import java.util.Collection; import java.util.Collections; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class GeneratedKeysMySQLTest { private Connection conn; - @Before + @BeforeEach public void setUp() { conn = Connections.getMySQL().getConnection().block(); } @Test - @Ignore("currently not supported") + @Disabled("currently not supported") public void test() { Mono.from(conn.createStatement("drop table if exists GENERATED_KEYS").execute()).block(); Mono.from( diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/MyR2DBCQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/MyR2DBCQueryTest.java index 124a5be1b5..742f26be9c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/MyR2DBCQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/MyR2DBCQueryTest.java @@ -18,15 +18,15 @@ import com.querydsl.r2dbc.MySQLTemplates; import com.querydsl.r2dbc.domain.QSurvey; import java.io.File; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MyR2DBCQueryTest { private R2DBCMySQLQuery query; private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new R2DBCMySQLQuery(null, MySQLTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/R2DBCMySQLQueryFactoryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/R2DBCMySQLQueryFactoryTest.java index 1216caa7c2..9982fbd670 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/R2DBCMySQLQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/mysql/R2DBCMySQLQueryFactoryTest.java @@ -21,15 +21,15 @@ import com.querydsl.r2dbc.domain.QSurvey; import io.r2dbc.spi.Connection; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; public class R2DBCMySQLQueryFactoryTest { private R2DBCMySQLQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { R2DBCConnectionProvider provider = () -> Mono.just(EasyMock.createNiceMock(Connection.class)); queryFactory = new R2DBCMySQLQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryFactoryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryFactoryTest.java index 30be35058d..bf6086a62d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryFactoryTest.java @@ -20,15 +20,15 @@ import com.querydsl.r2dbc.domain.QSurvey; import io.r2dbc.spi.Connection; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; public class R2DBCPostgreQueryFactoryTest { private R2DBCPostgreQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { R2DBCConnectionProvider provider = new R2DBCConnectionProvider() { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryTest.java index dd5ed76d94..8274f576f3 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/postgresql/R2DBCPostgreQueryTest.java @@ -5,8 +5,8 @@ import com.querydsl.r2dbc.PostgreSQLTemplates; import com.querydsl.r2dbc.domain.QEmployee; import com.querydsl.r2dbc.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class R2DBCPostgreQueryTest { @@ -16,7 +16,7 @@ public class R2DBCPostgreQueryTest { private QEmployee employee = new QEmployee("employee"); - @Before + @BeforeEach public void setUp() { query = new R2DBCPostgreQuery( diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/AbstractSuite.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/AbstractSuite.java index 52f0e6f3a4..b07b0269d3 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/AbstractSuite.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/AbstractSuite.java @@ -1,7 +1,3 @@ package com.querydsl.r2dbc.suites; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; - -@RunWith(Enclosed.class) public abstract class AbstractSuite {} diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2ExceptionSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2ExceptionSuiteTest.java index 3ab357f5b2..ad58d87742 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2ExceptionSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2ExceptionSuiteTest.java @@ -3,25 +3,24 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.base.Throwables; -import com.querydsl.core.testutil.H2; import com.querydsl.r2dbc.AbstractBaseTest; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.H2Templates; import com.querydsl.sql.DefaultSQLExceptionTranslator; import com.querydsl.sql.SQLExceptionTranslator; import java.sql.SQLException; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2ExceptionSuiteTest extends AbstractBaseTest { private static final SQLExceptionTranslator exceptionTranslator = DefaultSQLExceptionTranslator.DEFAULT; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(H2Templates.builder().build()); Connections.initH2(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2LiteralsSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2LiteralsSuiteTest.java index 956c948f9b..f5ca1f91c9 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2LiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2LiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -13,33 +12,44 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2LiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2SuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2SuiteTest.java index 447d2c82df..a127b616ee 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2SuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2SuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -13,33 +12,44 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2SuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build()); Connections.initH2(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithQuotingTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithQuotingTest.java index c2f3d3154a..64b3562e32 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithQuotingTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithQuotingTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -12,31 +11,41 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2WithQuotingTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(H2Templates.builder().quote().newLineToSingleSpace().build()); Connections.initH2(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithSchemaTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithSchemaTest.java index 44452bb616..d30ada3ad7 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithSchemaTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/H2WithSchemaTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -13,33 +12,44 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2WithSchemaTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration( H2Templates.builder().printSchema().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLLiteralsSuiteTest.java index 91ef46b133..47d7b289ef 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLSuiteTest.java index 4a6bfb3b77..db7f80a63c 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MSSQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build()); Connections.initSQLServer(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLLiteralsSuiteTest.java index 1c165ac76e..0cc9c612e7 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectMySQL extends SelectMySQLBase {} + @Nested + class SelectMySQL extends SelectMySQLBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLSuiteTest.java index 9aa7e6e018..7d8e9f4c98 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectMySQL extends SelectMySQLBase {} + @Nested + class SelectMySQL extends SelectMySQLBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build()); Connections.initMySQL(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLWithQuotingTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLWithQuotingTest.java index 068eadb3dd..544733c057 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLWithQuotingTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/MySQLWithQuotingTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Connections; import com.querydsl.r2dbc.DeleteBase; @@ -13,33 +12,44 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLWithQuotingTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration(MySQLTemplates.builder().quote().newLineToSingleSpace().build()); Connections.initMySQL(); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLLiteralsSuiteTest.java index 8eef080168..4852c02dcf 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Configuration; import com.querydsl.r2dbc.Connections; @@ -15,20 +14,25 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; // TODO r2dbc-postgres drops some inserts, readd after fix -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public abstract class PostgreSQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase { + @Nested + class KeywordQuoting extends KeywordQuotingBase { private Configuration previous; @@ -49,21 +53,28 @@ public void tearDown() throws Exception { } } - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration( PostgreSQLTemplates.builder().quote().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLSuiteTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLSuiteTest.java index 642838f18a..b71639cfe4 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/suites/PostgreSQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.r2dbc.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.r2dbc.BeanPopulationBase; import com.querydsl.r2dbc.Configuration; import com.querydsl.r2dbc.Connections; @@ -15,20 +14,25 @@ import com.querydsl.r2dbc.TypesBase; import com.querydsl.r2dbc.UnionBase; import com.querydsl.r2dbc.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; // TODO r2dbc-postgres drops some inserts, readd after fix -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public abstract class PostgreSQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase { + @Nested + class KeywordQuoting extends KeywordQuotingBase { private Configuration previous; @@ -49,21 +53,28 @@ public void tearDown() throws Exception { } } - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initConfiguration( PostgreSQLTemplates.builder().quote().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/AbstractJSR310DateTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/AbstractJSR310DateTimeTypeTest.java index 925a34fa78..8ad24d42e6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/AbstractJSR310DateTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/AbstractJSR310DateTimeTypeTest.java @@ -3,9 +3,9 @@ import java.time.temporal.Temporal; import java.util.Calendar; import java.util.TimeZone; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class AbstractJSR310DateTimeTypeTest { @@ -23,12 +23,12 @@ public AbstractJSR310DateTimeTypeTest(AbstractJSR310DateTimeType type) { private TimeZone tz; - @Before + @BeforeEach public void before() { tz = TimeZone.getDefault(); } - @After + @AfterEach public void after() { TimeZone.setDefault(tz); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310InstantTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310InstantTypeTest.java index 6107e953ec..d68fd59fd3 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310InstantTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310InstantTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310InstantTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTimeTypeTest.java index 27c8e4c99c..1167b86fda 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTimeTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.LocalDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310LocalDateTimeTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTypeTest.java index a870fe4112..05853c9d45 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalDateTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310LocalDateTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalTimeTypeTest.java index e337791336..40567f279d 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310LocalTimeTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310LocalTimeTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetDateTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetDateTimeTypeTest.java index d67e3bc415..7843e5f8a5 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetDateTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetDateTimeTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.OffsetDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310OffsetDateTimeTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetTimeTypeTest.java index 21cd19aa08..d6be629a6f 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310OffsetTimeTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.OffsetTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310OffsetTimeTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310ZonedDateTimeTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310ZonedDateTimeTypeTest.java index fbb29a5f9b..c15afa5d93 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310ZonedDateTimeTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/JSR310ZonedDateTimeTypeTest.java @@ -1,7 +1,7 @@ package com.querydsl.r2dbc.types; import java.time.ZonedDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310ZonedDateTimeTypeTest extends AbstractJSR310DateTimeTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocalDateTimeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocalDateTimeTest.java index 8f71857155..3bbcb6b0f6 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocalDateTimeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocalDateTimeTest.java @@ -2,8 +2,8 @@ import java.util.Calendar; import java.util.TimeZone; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class LocalDateTimeTest { @@ -11,7 +11,7 @@ public class LocalDateTimeTest { // private LocalDateTimeType type = new LocalDateTimeType(); - @BeforeClass + @BeforeAll public static void setUpClass() { UTC.setTimeInMillis(0); } diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocaleTypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocaleTypeTest.java index 9dad256504..5773f85d77 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocaleTypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/LocaleTypeTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LocaleTypeTest { diff --git a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java index 2714e3b802..5b3b194fa0 100644 --- a/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java +++ b/querydsl-libraries/querydsl-r2dbc/src/test/java/com/querydsl/r2dbc/types/TypeTest.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.UUID; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeTest implements InvocationHandler { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala index 2cc2b06e6e..3b537457e0 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala @@ -4,7 +4,7 @@ import java.io.StringWriter import com.querydsl.codegen.utils._ import com.querydsl.codegen._ -import org.junit._ +import org.junit.jupiter.api._ class CaseClassSerializerTest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala index 9f3a0d081a..02a30ea1d1 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ExpressionTest.scala @@ -2,14 +2,14 @@ package com.querydsl.scala import com.querydsl.core.types._ import com.querydsl.scala.Matchers._ -import org.junit.{Assert, Test} +import org.junit.jupiter.api.{Assertions, Test} class ExpressionTest { val person = Person as "person" def assertEquals(expected: String, actual: Any): Unit = { - Assert.assertEquals(expected, actual.toString) + Assertions.assertEquals(expected, actual.toString) } @Test diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala index 1602312baf..11d8d1b55b 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala @@ -3,7 +3,7 @@ package com.querydsl.scala import jakarta.persistence._ import com.querydsl.codegen.GenericExporter -import org.junit.Test +import org.junit.jupiter.api.Test class GenericExporterJPATest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala index 800a71703b..9ffbd46be1 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala @@ -3,7 +3,7 @@ package com.querydsl.scala import java.io.File import com.querydsl.codegen.GenericExporter -import org.junit.Test +import org.junit.jupiter.api.Test class GenericExporterTest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala index 2cc3030eb5..d936ad562f 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/QPersonTest.scala @@ -1,6 +1,6 @@ package com.querydsl.scala -import org.junit.{Assert, Test} +import org.junit.jupiter.api.{Assertions, Test} class QPersonTest { @@ -28,7 +28,7 @@ class QPersonTest { } def assertEquals(expected: String, actual: Any): Unit = { - Assert.assertEquals(expected, actual.toString) + Assertions.assertEquals(expected, actual.toString) } } \ No newline at end of file diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala index b95bc61eb0..ad2c327340 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ReflectionUtilsTest.scala @@ -1,7 +1,7 @@ package com.querydsl.scala -import org.junit.Assert._ -import org.junit._ +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api._ class ReflectionUtilsTest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala index b969be2988..ab57ce6320 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala @@ -4,8 +4,8 @@ import java.io.StringWriter import com.querydsl.codegen.utils._ import com.querydsl.codegen._ -import org.junit.Assert._ -import org.junit._ +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api._ class ScalaBeanSerializerTest { @@ -47,7 +47,7 @@ class ScalaBeanSerializerTest { //println(str) toMatch.split("\\n").map(_.trim).foreach { line => - assertTrue(line, str.contains(line)) + assertTrue(str.contains(line), line) } } diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala index 5c0478600d..b07473a318 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala @@ -5,8 +5,8 @@ import java.io.StringWriter import com.querydsl.codegen.utils._ import com.querydsl.codegen.utils.model._ import com.querydsl.codegen._ -import org.junit.Assert._ -import org.junit.{Before, Test} +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api.{BeforeEach, Test} class ScalaEntitySerializerTest { @@ -14,7 +14,7 @@ class ScalaEntitySerializerTest { val writer = new StringWriter() - @Before + @BeforeEach def setUp(): Unit = { val typeModel = new ClassType(TypeCategory.ENTITY, classOf[Person]) entityType = new EntityType(typeModel) diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala index 1f1eb1d071..80c7cb377e 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala @@ -4,8 +4,8 @@ import java.sql.{Connection, DriverManager, Statement} import com.querydsl.sql.dml._ import com.querydsl.sql.{Configuration, HSQLDBTemplates, RelationalPath, SQLQuery} -import org.junit.Assert._ -import org.junit._ +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api._ import test._ object JDBCIntegrationTest { @@ -13,7 +13,7 @@ object JDBCIntegrationTest { private var connection: Connection = _ private var statement: Statement = _ - @BeforeClass + @BeforeAll def setUpClass(): Unit = { Class.forName("org.h2.Driver") val url = "jdbc:h2:mem:testdb" + System.currentTimeMillis() + ";MODE=legacy" @@ -46,7 +46,7 @@ object JDBCIntegrationTest { // TODO : create table with multi column primary key } - @AfterClass + @AfterAll def tearDownClass(): Unit = { try { statement.close() @@ -67,12 +67,12 @@ class JDBCIntegrationTest extends SQLHelpers { def connection = JDBCIntegrationTest.connection - @Before + @BeforeEach def setUp(): Unit = { connection.setAutoCommit(false) } - @After + @AfterEach def tearDown(): Unit = { connection.rollback() connection.setAutoCommit(true) diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala index c893927800..964e25b304 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala @@ -3,13 +3,13 @@ package com.querydsl.scala.sql import com.querydsl.scala._ import com.querydsl.sql._ import com.querydsl.sql.codegen._ -import org.junit._ +import org.junit.jupiter.api._ object MetaDataExporterTest { private var connection: java.sql.Connection = _ - @BeforeClass + @BeforeAll def setUp(): Unit = { Class.forName("org.h2.Driver") val url = "jdbc:h2:mem:testdb" + System.currentTimeMillis() + ";MODE=legacy" @@ -53,7 +53,7 @@ object MetaDataExporterTest { } } - @AfterClass + @AfterAll def tearDown(): Unit = { connection.close() } diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala index 6de0a315fa..0376d6b893 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/PathsTest.scala @@ -1,8 +1,8 @@ package com.querydsl.scala.sql import com.querydsl.core.types._ -import org.junit.Assert._ -import org.junit._ +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api._ import test._ class PathsTest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala index d28f672169..462717c942 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/QuerySyntaxTest.scala @@ -1,8 +1,8 @@ package com.querydsl.scala.sql import com.querydsl.sql._ -import org.junit.Assert._ -import org.junit.Test +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api.Test class QuerySyntaxTest { diff --git a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala index ef2901252c..c3a9e45ee2 100644 --- a/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala +++ b/querydsl-libraries/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala @@ -8,8 +8,8 @@ import com.querydsl.codegen._ import com.querydsl.scala._ import com.querydsl.sql._ import com.querydsl.sql.codegen._ -import org.junit.Assert._ -import org.junit._ +import org.junit.jupiter.api.Assertions._ +import org.junit.jupiter.api._ class ScalaMetaDataSerializerTest { @@ -17,7 +17,7 @@ class ScalaMetaDataSerializerTest { val writer = new StringWriter() - @Before + @BeforeEach def setUp(): Unit = { // type val typeModel = new SimpleType(TypeCategory.ENTITY, @@ -46,7 +46,7 @@ class ScalaMetaDataSerializerTest { serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) val str = writer.toString //System.err.println(str) - assertTrue("companion object isn't before class", str.indexOf("object") < str.indexOf("class")) + assertTrue(str.indexOf("object") < str.indexOf("class"), "companion object isn't before class") //assertTrue("companion object isn't before annotations", str.indexOf("object") < str.indexOf("@Table")) } diff --git a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java index 78a1e77a41..ce568d8a99 100644 --- a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java +++ b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/GeometryPathTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeometryPathTest { diff --git a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java index 31f08aa7a3..3d3354af79 100644 --- a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java +++ b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/hibernate/HibernateSpatialSupportTest.java @@ -4,7 +4,7 @@ import com.querydsl.core.types.Operator; import com.querydsl.spatial.SpatialOps; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HibernateSpatialSupportTest { diff --git a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java index a1dfb8fe88..622ffa3d8a 100644 --- a/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java +++ b/querydsl-libraries/querydsl-spatial/src/test/java/com/querydsl/spatial/jts/JTSGeometryPathTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JTSGeometryPathTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java index 077bae9ffb..2858509759 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/GeoDBTemplatesTest.java @@ -1,7 +1,7 @@ package com.querydsl.sql.spatial; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeoDBTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java index 8eda7051b2..38e7b8daef 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/MySQLSpatialTemplatesTest.java @@ -1,7 +1,7 @@ package com.querydsl.sql.spatial; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MySQLSpatialTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java index 07a06975fa..ffc1f0f65d 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/PostGISTemplatesTest.java @@ -1,7 +1,7 @@ package com.querydsl.sql.spatial; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PostGISTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java index cfeeb3a2d9..dea79ad225 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SQLServer2008SpatialTemplatesTest.java @@ -1,7 +1,7 @@ package com.querydsl.sql.spatial; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServer2008SpatialTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java index c0368f845d..346ba61b0f 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/SpatialBase.java @@ -31,7 +31,7 @@ import org.geolatte.geom.Polygon; import org.geolatte.geom.ProjectedGeometryOperations; import org.geolatte.geom.codec.Wkt; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SpatialBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java index 6c05327339..2214d550e9 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/TeradataSpatialTemplatesTest.java @@ -1,7 +1,7 @@ package com.querydsl.sql.spatial; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TeradataSpatialTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java index 890858be42..c517b690df 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2LiteralsSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.H2GISTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2LiteralsSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2GISTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java index b5b7b84624..b98648bae9 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/H2SuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.H2GISTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2SuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2GISTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java index 3133231914..c47eab1f27 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLLiteralsSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.SQLServer2008SpatialTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLLiteralsSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLServer(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java index 7ba6014e55..b9f0ecf738 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MSSQLSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.SQLServer2008SpatialTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLServer(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java index ea9bde8aa8..a52aa0ca2c 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLLiteralsSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.MySQLSpatialTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLLiteralsSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initMySQL(); Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java index 9215652c80..5be0fb4ab5 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/MySQLSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.MySQLSpatialTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initMySQL(); Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java index efc806a310..a6605119cf 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLLiteralsSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.PostGISTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLLiteralsSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initPostgreSQL(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java index f0f750ec59..63d02a010b 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/PostgreSQLSuiteTest.java @@ -1,19 +1,20 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.sql.Connections; import com.querydsl.sql.spatial.PostGISTemplates; import com.querydsl.sql.spatial.SpatialBase; import com.querydsl.sql.suites.AbstractSuite; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLSuiteTest extends AbstractSuite { - public static class Spatial extends SpatialBase {} + @Nested + class Spatial extends SpatialBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initPostgreSQL(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java index 6ea4497b7d..c42d09f274 100644 --- a/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java +++ b/querydsl-libraries/querydsl-sql-spatial/src/test/java/com/querydsl/sql/spatial/suites/SpatialTest.java @@ -1,17 +1,16 @@ package com.querydsl.sql.spatial.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.Connections; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class SpatialTest { - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { Connections.initH2(); // Connections.initMySQL(); @@ -19,7 +18,7 @@ public void setUp() throws ClassNotFoundException, SQLException { // Connections.initTeradata(); } - @After + @AfterEach public void tearDown() throws SQLException { Connections.close(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java index 84568a27a5..0246544972 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java @@ -30,11 +30,9 @@ import java.util.List; import java.util.logging.Logger; import org.jetbrains.annotations.Nullable; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.rules.MethodRule; -import org.junit.rules.TestRule; +import org.junit.jupiter.api.extension.ExtendWith; +@ExtendWith({TargetExtension.class, SkipForQuotedExtension.class}) public abstract class AbstractBaseTest { protected static final Logger logger = Logger.getLogger(AbstractBaseTest.class.getName()); @@ -86,10 +84,6 @@ public AbstractBaseTest() { } } - @Rule public MethodRule skipForQuotedRule = new SkipForQuotedRule(configuration); - - @Rule @ClassRule public static TestRule targetRule = new TargetRule(); - protected void add(List list, T arg, Target... exclusions) { if (exclusions.length > 0) { for (Target t : exclusions) { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java index 671b1b1433..c567ffbba1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractJDBCTest.java @@ -17,8 +17,8 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractJDBCTest { @@ -26,7 +26,7 @@ public abstract class AbstractJDBCTest { protected Statement statement; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { Class.forName("org.hsqldb.jdbcDriver"); var url = "jdbc:hsqldb:mem:testdb"; @@ -34,7 +34,7 @@ public void setUp() throws ClassNotFoundException, SQLException { statement = connection.createStatement(); } - @After + @AfterEach public void tearDown() throws SQLException { try { statement.close(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java index 744f64321f..2ed07dc1da 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractSQLTemplatesTest.java @@ -26,8 +26,8 @@ import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.sql.domain.QSurvey; import java.util.Collection; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class AbstractSQLTemplatesTest { @@ -41,7 +41,7 @@ public abstract class AbstractSQLTemplatesTest { protected abstract SQLTemplates createTemplates(); - @Before + @BeforeEach public void setUp() { templates = createTemplates(); templates.newLineToSingleSpace(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java index 52abbcf9e1..eeacd06fcd 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ArrayTypesTest.java @@ -3,14 +3,14 @@ import static org.assertj.core.api.Assertions.assertThat; import java.sql.Types; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ArrayTypesTest { private Configuration configuration; - @Before + @BeforeEach public void setUp() { configuration = Configuration.DEFAULT; } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java index bdfdbe66c8..2e206882f8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java @@ -27,15 +27,15 @@ import com.querydsl.sql.dml.BeanMapper; import com.querydsl.sql.domain.Employee; import com.querydsl.sql.domain.QEmployee; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; @ExcludeIn({CUBRID, DB2, DERBY, ORACLE, SQLSERVER, POSTGRESQL, SQLITE, TERADATA}) public abstract class BeanPopulationBase extends AbstractBaseTest { private final QEmployee e = new QEmployee("e"); - @After + @AfterEach public void tearDown() { delete(e).where(e.firstname.eq("John")).execute(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java index 790518c76f..3970a18741 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CUBRIDTemplatesTest.java @@ -13,9 +13,9 @@ */ package com.querydsl.sql; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class CUBRIDTemplatesTest extends AbstractSQLTemplatesTest { @Override diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java index da495dae90..f7c4fe4819 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/CoalesceTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.Coalesce; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CoalesceTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java index 7b65ef57e9..64873cba9f 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ColumnMetadataTest.java @@ -4,7 +4,7 @@ import com.querydsl.sql.domain.QEmployee; import java.sql.Types; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ColumnMetadataTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java index 648b1f38a2..ab9c33eae6 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConfigurationTest.java @@ -14,6 +14,7 @@ package com.querydsl.sql; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.alias.Gender; import com.querydsl.sql.domain.QSurvey; @@ -34,7 +35,7 @@ import java.sql.Types; import java.util.Locale; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConfigurationTest { @@ -140,14 +141,22 @@ public void columnOverride() { .isEqualTo("lower"); } - @Test(expected = NullPointerException.class) + @Test public void npeWithNullParameterOfChainedNameMappingConstructor() { - new ChainedNameMapping((NameMapping[]) null); + assertThrows( + NullPointerException.class, + () -> { + new ChainedNameMapping((NameMapping[]) null); + }); } - @Test(expected = NullPointerException.class) + @Test public void npeWithNullElementInParameterOfChainedNameMappingConstructor() { - new ChainedNameMapping(new NameMapping[] {null}); + assertThrows( + NullPointerException.class, + () -> { + new ChainedNameMapping(new NameMapping[] {null}); + }); } @Test diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java index 50b43e31e5..5dfc844e90 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -22,6 +22,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Time; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import org.hsqldb.types.Types; @@ -750,6 +751,26 @@ public static void initMySQL() throws SQLException, ClassNotFoundException { return; } + // The shared MySQL database accumulates tables from other suites under two naming conventions: + // Hibernate keeps the entity case (Child2) while EclipseLink upper-cases it (CHILD2). On a + // case-sensitive server (lower_case_table_names=0) both survive, and the metadata export then + // maps CHILD2 and Child2 to the same QChild2 and fails. Drop every table up front so the test + // schema is deterministic regardless of what previous runs left behind. + var leftovers = new ArrayList(); + try (var rs = + stmt.executeQuery( + "select table_name from information_schema.tables" + + " where table_schema = database() and table_type = 'BASE TABLE'")) { + while (rs.next()) { + leftovers.add(rs.getString(1)); + } + } + stmt.execute("SET FOREIGN_KEY_CHECKS = 0"); + for (String table : leftovers) { + stmt.execute("drop table if exists `" + table + "`"); + } + stmt.execute("SET FOREIGN_KEY_CHECKS = 1"); + // shapes stmt.execute("drop table if exists SHAPES"); stmt.execute("create table SHAPES (ID int not null primary key, GEOMETRY geometry)"); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java index d715d3f53d..db963ada54 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ConnectionsTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.geolatte.geom.codec.Wkt; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConnectionsTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java index a8865a48cf..c5d40888cf 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DB2TemplatesTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DB2TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java index e10eaa45fe..5e892f0ff3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java @@ -1,16 +1,15 @@ package com.querydsl.sql; -import com.querydsl.core.testutil.ReportingOnly; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.DateTimePath; import com.querydsl.core.types.dsl.Expressions; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(ReportingOnly.class) +@Tag("com.querydsl.core.testutil.ReportingOnly") public class DateArithmeticTest { private String serialize(Expression expr, SQLTemplates templates) { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java index 10ad7de8c0..da50efd59e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java @@ -30,9 +30,9 @@ import com.querydsl.sql.domain.QEmployee; import com.querydsl.sql.domain.QSurvey; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class DeleteBase extends AbstractBaseTest { @@ -41,12 +41,12 @@ private void reset() throws SQLException { insert(survey).values(1, "Hello World", "Hello").execute(); } - @Before + @BeforeEach public void setUp() throws SQLException { reset(); } - @After + @AfterEach public void tearDown() throws SQLException { reset(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java index 399ca057ac..973fafd2f3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DependenciesTest.java @@ -17,13 +17,13 @@ import java.io.IOException; import jdepend.framework.JDepend; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class DependenciesTest { @Test - @Ignore + @Disabled public void test() throws IOException { var jdepend = new JDepend(); jdepend.addDirectory("target/classes/com/querydsl/sql"); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java index 61c7d5b09f..566345d3d4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DerbyTemplatesTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.Operation; import com.querydsl.core.types.Ops; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DerbyTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java index 05938763c2..9ec1db794d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ExtendedSQLTest.java @@ -10,7 +10,7 @@ import com.querydsl.core.types.dsl.Wildcard; import com.querydsl.sql.mysql.MySQLQuery; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExtendedSQLTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java index b502d44f21..a06af8ae2a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/FirebirdTemplatesTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FirebirdTemplatesTest extends AbstractSQLTemplatesTest { @@ -29,6 +29,7 @@ protected SQLTemplates createTemplates() { } @Override + @Test public void arithmetic() { // uses additional casts } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java index c68cfe7615..92ce1ee02c 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ForeignKeyTest.java @@ -18,7 +18,7 @@ import com.querydsl.sql.domain.Employee; import com.querydsl.sql.domain.QEmployee; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ForeignKeyTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java index eacb12caab..270e977fd6 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/H2TemplatesTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class H2TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java index 04fb535094..4a2bdbccda 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/HSQLDBTemplatesTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HSQLDBTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java index 8446cde9d8..eac6a9fca0 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java @@ -28,6 +28,7 @@ import static com.querydsl.sql.Constants.survey2; import static com.querydsl.sql.SQLExpressions.select; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.QueryException; import com.querydsl.core.QueryFlag.Position; @@ -51,10 +52,10 @@ import java.time.LocalDateTime; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class InsertBase extends AbstractBaseTest { @@ -65,12 +66,12 @@ private void reset() throws SQLException { delete(QDateTest.qDateTest).execute(); } - @Before + @BeforeEach public void setUp() throws SQLException { reset(); } - @After + @AfterEach public void tearDown() throws SQLException { reset(); } @@ -226,7 +227,7 @@ public void insert_nulls_in_batch() { } @Test - @Ignore + @Disabled @ExcludeIn({DERBY}) public void insert_nulls_in_batch2() { Mapper mapper = DefaultMapper.WITH_NULL_BINDINGS; @@ -298,22 +299,32 @@ public void insert_with_keys_Projected2() throws SQLException { assertThat(id).isNotNull(); } - @Test(expected = QueryException.class) + @Test @IncludeIn({DERBY, HSQLDB}) public void insert_with_keys_OverriddenColumn() throws SQLException { - var originalColumnName = ColumnMetadata.getName(survey.id); - try { - configuration.registerColumnOverride( - survey.getSchemaName(), survey.getTableName(), originalColumnName, "wrongColumnName"); - - var sqlInsertClause = new SQLInsertClause(connection, configuration, survey); - sqlInsertClause.addListener(new TestLoggingListener()); - Object id = sqlInsertClause.set(survey.name, "Hello you").executeWithKey(survey.id); - assertThat(id).isNotNull(); - } finally { - configuration.registerColumnOverride( - survey.getSchemaName(), survey.getTableName(), originalColumnName, originalColumnName); - } + assertThrows( + QueryException.class, + () -> { + var originalColumnName = ColumnMetadata.getName(survey.id); + try { + configuration.registerColumnOverride( + survey.getSchemaName(), + survey.getTableName(), + originalColumnName, + "wrongColumnName"); + + var sqlInsertClause = new SQLInsertClause(connection, configuration, survey); + sqlInsertClause.addListener(new TestLoggingListener()); + Object id = sqlInsertClause.set(survey.name, "Hello you").executeWithKey(survey.id); + assertThat(id).isNotNull(); + } finally { + configuration.registerColumnOverride( + survey.getSchemaName(), + survey.getTableName(), + originalColumnName, + originalColumnName); + } + }); } // http://sourceforge.net/tracker/index.php?func=detail&aid=3513432&group_id=280608&atid=2377440 diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java index d975b9af01..a70cba3220 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JDBCTypeMappingTest.java @@ -15,13 +15,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.ReportingOnly; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Blob; import java.sql.Types; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; public class JDBCTypeMappingTest { @@ -83,7 +82,7 @@ public void numericTypes() { } @Test - @Category(ReportingOnly.class) + @Tag("com.querydsl.core.testutil.ReportingOnly") public void max() { System.err.println("Byte: " + String.valueOf(Byte.MAX_VALUE).length()); System.err.println("Short: " + String.valueOf(Short.MAX_VALUE).length()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java index 6d6e7ade50..9fef95034d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JavaTypeMappingTest.java @@ -28,7 +28,7 @@ import com.querydsl.sql.types.ShortType; import java.io.FileInputStream; import java.io.InputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JavaTypeMappingTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java index 8dfdf5af7d..ed4ad67892 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinFlagsTest.java @@ -19,8 +19,8 @@ import com.querydsl.sql.domain.QSurvey; import java.sql.Connection; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JoinFlagsTest { @@ -31,7 +31,7 @@ public class JoinFlagsTest { private SQLQuery query; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { s1 = new QSurvey("s"); s2 = new QSurvey("s2"); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java index e9587ea62b..dfd4867f09 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/JoinUsageTest.java @@ -14,17 +14,22 @@ package com.querydsl.sql; import static com.querydsl.sql.SQLExpressions.selectFrom; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.sql.domain.QSurvey; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class JoinUsageTest { - @Test(expected = IllegalStateException.class) - @Ignore + @Test + @Disabled public void join_already_declared() { - var survey = QSurvey.survey; - selectFrom(survey).fullJoin(survey); + assertThrows( + IllegalStateException.class, + () -> { + var survey = QSurvey.survey; + selectFrom(survey).fullJoin(survey); + }); } } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java index 57cfef4d62..255b656574 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyAccessorsTest.java @@ -18,7 +18,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeyAccessorsTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java index c67cfe9a26..4c1c0a285a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeyTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.PathMetadataFactory; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("serial") public class KeyTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java index 529538120e..94220ef73a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java @@ -25,9 +25,9 @@ import com.querydsl.sql.ddl.CreateTableClause; import com.querydsl.sql.ddl.DropTableClause; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class KeywordQuotingBase extends AbstractBaseTest { @@ -58,7 +58,7 @@ protected void addMetadata() { private final Quoting quoting = Quoting.quoting; - @Before + @BeforeEach public void setUp() throws Exception { new CreateTableClause(connection, configuration, "quoting") .column("from", String.class) @@ -68,7 +68,7 @@ public void setUp() throws Exception { execute(insert(quoting).columns(quoting.from, quoting.all).values("from", true)); } - @After + @AfterEach public void tearDown() throws Exception { new DropTableClause(connection, configuration, "quoting").execute(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java index ab5c24ae34..18edb79d0b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/LikeEscapeBase.java @@ -17,13 +17,13 @@ import static org.assertj.core.api.Assertions.assertThat; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class LikeEscapeBase extends AbstractBaseTest { - @Before + @BeforeEach public void setUp() throws SQLException { delete(survey).execute(); var insert = insert(survey); @@ -33,7 +33,7 @@ public void setUp() throws SQLException { insert.execute(); } - @After + @AfterEach public void tearDown() throws SQLException { delete(survey).execute(); insert(survey).values(1, "Hello World", "Hello").execute(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java index 89826bdfc5..7202a2371f 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/ListSubQueryTest.java @@ -9,7 +9,7 @@ import com.querydsl.sql.domain.QSurvey; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ListSubQueryTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java index 76c77c2f81..b613745dde 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java @@ -34,9 +34,9 @@ import java.sql.SQLException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class MergeBase extends AbstractBaseTest { @@ -45,12 +45,12 @@ private void reset() throws SQLException { insert(survey).values(1, "Hello World", "Hello").execute(); } - @Before + @BeforeEach public void setUp() throws SQLException { reset(); } - @After + @AfterEach public void tearDown() throws SQLException { reset(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeUsingBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeUsingBase.java index 03dbfcc684..06e82181a3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeUsingBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeUsingBase.java @@ -29,9 +29,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MergeUsingBase extends AbstractBaseTest { @@ -40,12 +40,12 @@ private void reset() throws SQLException { insert(survey).values(1, "Hello World", "Hello").execute(); } - @Before + @BeforeEach public void setUp() throws SQLException { reset(); } - @After + @AfterEach public void tearDown() throws SQLException { reset(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java index 7ee85402b3..84405d5e8e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MetadataTest.java @@ -1,10 +1,10 @@ package com.querydsl.sql; import java.sql.SQLException; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class MetadataTest { // CUBRID diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java index 5fe83fab30..ea36b0ac32 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MultikeyTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MultikeyTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java index 2005fcee73..d785642c60 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MySQLTemplatesTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MySQLTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java index 01fd9d1d4a..91079ef24a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTemplatesTest.java @@ -26,7 +26,7 @@ import com.querydsl.core.types.dsl.SimpleExpression; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OracleTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java index 80b1ee88ee..cdaafeec23 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/OracleTimeTest.java @@ -1,14 +1,14 @@ package com.querydsl.sql; import java.sql.SQLException; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class OracleTimeTest { - @After + @AfterEach public void tearDown() throws SQLException { Connections.close(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java index 8aa52242bc..6c4246d2bf 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PaginationTest.java @@ -3,14 +3,13 @@ import com.querydsl.core.QueryMetadata; import com.querydsl.core.QueryModifiers; import com.querydsl.core.support.QueryMixin; -import com.querydsl.core.testutil.ReportingOnly; import com.querydsl.sql.domain.QEmployee; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(ReportingOnly.class) +@Tag("com.querydsl.core.testutil.ReportingOnly") public class PaginationTest { private String serialize(QueryMetadata metadata, SQLTemplates templates) { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java index b46902a3a8..b041f2bfa8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PostgreSQLTemplatesTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PostgreSQLTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java index 052832b14c..8f4cb97d97 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/PrecedenceTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PrecedenceTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java index e7d5fe1a51..70013c0179 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBean2Test.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.BeanPath; import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.core.types.dsl.StringPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QBean2Test { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java index 05545dafe2..a4a41c406e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QBeanTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Projections; import com.querydsl.sql.domain.Employee; import com.querydsl.sql.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QBeanTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java index a31d60801e..83ba609caa 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QPersonTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.QBean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QPersonTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java index 760ed78ce1..e369f74dc3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryMutabilityTest.java @@ -16,31 +16,30 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.QueryMutability; -import com.querydsl.core.testutil.Derby; import com.querydsl.sql.domain.QSurvey; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class QueryMutabilityTest { private static final QSurvey survey = new QSurvey("survey"); private Connection connection; - @Before + @BeforeEach public void setUp() throws Exception { Connections.initDerby(); connection = Connections.getConnection(); } - @After + @AfterEach public void tearDown() throws SQLException { Connections.close(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java index 9451c9bf87..47c76468e4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/QueryPerformanceTest.java @@ -5,15 +5,13 @@ import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.JoinType; import com.querydsl.core.QueryMetadata; -import com.querydsl.core.testutil.H2; -import com.querydsl.core.testutil.Performance; import java.sql.SQLException; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; @@ -22,7 +20,8 @@ import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; -@Category({H2.class, Performance.class}) +@Tag("com.querydsl.core.testutil.H2") +@Tag("com.querydsl.core.testutil.Performance") public class QueryPerformanceTest { private static final String QUERY = @@ -36,7 +35,7 @@ public class QueryPerformanceTest { private static final Configuration conf = new Configuration(templates); - @BeforeClass + @BeforeAll public static void setUpClass() throws SQLException, ClassNotFoundException { Connections.initH2(); var conn = Connections.getConnection(); @@ -57,7 +56,7 @@ public static void setUpClass() throws SQLException, ClassNotFoundException { conn.setAutoCommit(false); } - @AfterClass + @AfterAll public static void tearDownClass() throws SQLException { var conn = Connections.getConnection(); var stmt = conn.createStatement(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java index 6240728422..5373748150 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalFunctionCallTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.PathBuilder; import com.querydsl.core.types.dsl.StringPath; import com.querydsl.sql.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalFunctionCallTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java index 2da9ce861c..955e58c506 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathExtractorTest.java @@ -9,7 +9,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalPathExtractorTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java index eb19336e30..34559845b1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/RelationalPathTest.java @@ -7,7 +7,7 @@ import com.querydsl.sql.domain.QSurvey; import java.io.IOException; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationalPathTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java index e8619ad27d..174ca561ef 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLBindingsTest.java @@ -6,7 +6,7 @@ import com.querydsl.sql.domain.QSurvey; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLBindingsTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java index 92d8164368..daa43f4968 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLCloseListenerTest.java @@ -3,20 +3,19 @@ import static com.querydsl.sql.Constants.employee; import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.domain.Employee; import java.sql.SQLException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class SQLCloseListenerTest { private SQLQuery query; - @Before + @BeforeEach public void setUp() throws SQLException, ClassNotFoundException { Connections.initH2(); var conf = new Configuration(H2Templates.DEFAULT); @@ -24,7 +23,7 @@ public void setUp() throws SQLException, ClassNotFoundException { query = new SQLQuery(Connections.getConnection(), conf).select(employee).from(employee); } - @After + @AfterEach public void tearDown() throws SQLException { Connections.close(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLExpressionsFunctionTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLExpressionsFunctionTest.java index 5273f3f589..62c769c22b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLExpressionsFunctionTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLExpressionsFunctionTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.StringTemplate; import com.querydsl.sql.dml.SQLInsertClause; import com.querydsl.sql.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLExpressionsFunctionTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java index 7ebd168b9b..0f72d4a2c1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLListenersTest.java @@ -18,7 +18,7 @@ import com.querydsl.sql.dml.SQLUpdateBatch; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLListenersTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java index edbbbd5d02..fb2ec6f138 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryFactoryTest.java @@ -19,14 +19,14 @@ import java.sql.Connection; import java.util.function.Supplier; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SQLQueryFactoryTest { private SQLQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { Supplier provider = () -> EasyMock.createNiceMock(Connection.class); queryFactory = new SQLQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java index 280c196e4d..edd1f66c5d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLQueryTest.java @@ -1,13 +1,19 @@ package com.querydsl.sql; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.querydsl.sql.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLQueryTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var survey = QSurvey.survey; - SQLExpressions.select(survey.id).from(survey).fetch(); + assertThrows( + IllegalStateException.class, + () -> { + var survey = QSurvey.survey; + SQLExpressions.select(survey.id).from(survey).fetch(); + }); } } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java index 875f476ff9..147bf0d985 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSerializerTest.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.TimeZone; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLSerializerTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java index 77961e14af..2991841491 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2005TemplatesTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServer2005TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java index 48af8ff86b..db6a567f71 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java @@ -23,7 +23,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.sql.dml.SQLDeleteClause; import com.querydsl.sql.dml.SQLUpdateClause; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java index 2822c5c9ea..f26cf50582 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLServerTemplatesTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.Operation; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServerTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java index 2b4179382c..db2ab6585b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLSubQueryTest.java @@ -16,6 +16,7 @@ import static com.querydsl.sql.SQLExpressions.select; import static com.querydsl.sql.SQLExpressions.union; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.Expression; @@ -28,33 +29,37 @@ import com.querydsl.sql.domain.QEmployee; import com.querydsl.sql.domain.QSurvey; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLSubQueryTest { private static final QEmployee employee = QEmployee.employee; - @Test(expected = IllegalArgumentException.class) + @Test public void unknownOperator() { - Operator op = - new Operator() { - @Override - public String name() { - return "unknownfn"; - } - - @Override - public String toString() { - return name(); - } - - @Override - public Class getType() { - return Object.class; - } - }; - SQLQuery query = new SQLQuery(); - query.from(employee).where(Expressions.booleanOperation(op, employee.id)).toString(); + assertThrows( + IllegalArgumentException.class, + () -> { + Operator op = + new Operator() { + @Override + public String name() { + return "unknownfn"; + } + + @Override + public String toString() { + return name(); + } + + @Override + public Class getType() { + return Object.class; + } + }; + SQLQuery query = new SQLQuery(); + query.from(employee).where(Expressions.booleanOperation(op, employee.id)).toString(); + }); } @SuppressWarnings("unchecked") diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java index 3f207641be..17ae72e1c7 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTemplatesTest.java @@ -28,7 +28,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java index 0d8af92e8a..b37977e951 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLTypeMappingTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.fail; import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLTypeMappingTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java index c3a225ea34..1f059774e7 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SQLiteTemplatesTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.types.Ops; import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLiteTemplatesTest extends AbstractSQLTemplatesTest { @@ -29,6 +29,7 @@ protected SQLTemplates createTemplates() { } @SuppressWarnings("unchecked") + @Test @Override public void union() { var one = Expressions.ONE; diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java index eaa192ad7d..be87c27caf 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SchemaAndTableTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SchemaAndTableTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java index 1900fc2c7f..1773e4f329 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -102,8 +102,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.compress.utils.Sets; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class SelectBase extends AbstractBaseTest { @@ -1050,11 +1050,15 @@ public void having_count() { } @SuppressWarnings("unchecked") - @Test(expected = IllegalArgumentException.class) + @Test public void illegalUnion() throws SQLException { - SubQueryExpression sq1 = query().from(employee).select(employee.id.max()); - SubQueryExpression sq2 = query().from(employee).select(employee.id.max()); - assertThat(query().from(employee).union(sq1, sq2).list()).isEmpty(); + assertThrows( + IllegalArgumentException.class, + () -> { + SubQueryExpression sq1 = query().from(employee).select(employee.id.max()); + SubQueryExpression sq2 = query().from(employee).select(employee.id.max()); + assertThat(query().from(employee).union(sq1, sq2).list()).isEmpty(); + }); } @Test @@ -1670,16 +1674,20 @@ public void params_anon() { .isEqualTo("Mike"); } - @Test(expected = ParamNotSetException.class) + @Test public void params_not_set() { - var name = new Param(String.class, "name"); - assertThat( - query() - .from(employee) - .where(employee.firstname.eq(name)) - .select(employee.firstname) - .fetchFirst()) - .isEqualTo("Mike"); + assertThrows( + ParamNotSetException.class, + () -> { + var name = new Param(String.class, "name"); + assertThat( + query() + .from(employee) + .where(employee.firstname.eq(name)) + .select(employee.firstname) + .fetchFirst()) + .isEqualTo("Mike"); + }); } @Test @@ -1918,7 +1926,7 @@ public void rpad() { } @Test - @Ignore + @Disabled @ExcludeIn({ORACLE, DERBY, SQLSERVER}) public void select_booleanExpr() throws SQLException { // TODO : FIXME @@ -1926,7 +1934,7 @@ public void select_booleanExpr() throws SQLException { } @Test - @Ignore + @Disabled @ExcludeIn({ORACLE, DERBY, SQLSERVER}) public void select_booleanExpr2() throws SQLException { // TODO : FIXME @@ -2326,9 +2334,11 @@ public void unique_wildcard() { assertThat(row.get(1, Object.class)).as(row.get(0, Object.class) + " is not null").isNotNull(); } - @Test(expected = NonUniqueResultException.class) + @Test public void uniqueResultContract() { - query().from(employee).select(employee.all()).fetchOne(); + assertThrows( + NonUniqueResultException.class, + () -> query().from(employee).select(employee.all()).fetchOne()); } @Test diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java index 994664c4a0..92e4763854 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectMySQLBase.java @@ -5,7 +5,7 @@ import com.querydsl.core.testutil.IncludeIn; import com.querydsl.sql.mysql.MySQLQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SelectMySQLBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java index 9396f3befb..dcdfb8cdb8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectOracleBase.java @@ -9,8 +9,8 @@ import com.querydsl.sql.oracle.OracleQuery; import java.sql.SQLException; import java.util.logging.Logger; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class SelectOracleBase extends AbstractBaseTest { @@ -33,7 +33,7 @@ protected SQLSerializer serialize(boolean forCountRow) { } @Test - @Ignore + @Disabled public void connectBy() throws SQLException { // TODO : come up with a legal case oracleQuery() diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java index cebc74259b..65c18a19f9 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectTeradataBase.java @@ -5,7 +5,7 @@ import com.querydsl.core.testutil.IncludeIn; import com.querydsl.sql.teradata.SetQueryBandClause; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SelectTeradataBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java index 2a9b2af082..ed3666dc0b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectWindowFunctionsBase.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SelectWindowFunctionsBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java index 18d3b98144..7c82533e51 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SerializationTest.java @@ -29,7 +29,7 @@ import com.querydsl.sql.domain.QSurvey; import java.sql.Connection; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SerializationTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedExtension.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedExtension.java new file mode 100644 index 0000000000..6fe8948758 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedExtension.java @@ -0,0 +1,30 @@ +package com.querydsl.sql; + +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code SkipForQuotedRule}. Disables test methods annotated + * with {@link SkipForQuoted} when the active configuration uses quoting, schema printing or + * literals. + */ +public class SkipForQuotedExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var testMethod = context.getTestMethod().orElse(null); + if (testMethod == null || !testMethod.isAnnotationPresent(SkipForQuoted.class)) { + return ConditionEvaluationResult.enabled("No @SkipForQuoted"); + } + var configuration = Connections.getConfiguration(); + if (configuration == null) { + return ConditionEvaluationResult.enabled("No configuration"); + } + var templates = configuration.getTemplates(); + if (templates.isUseQuotes() || templates.isPrintSchema() || configuration.getUseLiterals()) { + return ConditionEvaluationResult.disabled("Skipped for quoted templates"); + } + return ConditionEvaluationResult.enabled("Not quoted"); + } +} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java deleted file mode 100644 index 2026bbfb87..0000000000 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SkipForQuotedRule.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.querydsl.sql; - -import com.querydsl.core.testutil.EmptyStatement; -import org.junit.rules.MethodRule; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.Statement; - -public class SkipForQuotedRule implements MethodRule { - - private final Configuration configuration; - - public SkipForQuotedRule(Configuration conf) { - this.configuration = conf; - } - - @Override - public Statement apply(Statement base, FrameworkMethod method, Object target) { - var templates = configuration.getTemplates(); - if (templates.isUseQuotes() || templates.isPrintSchema() || configuration.getUseLiterals()) { - var skip = method.getMethod().isAnnotationPresent(SkipForQuoted.class); - return skip ? EmptyStatement.DEFAULT : base; - } else { - return base; - } - } -} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java index 652e7541ff..aa2eb718db 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java @@ -30,7 +30,7 @@ import java.math.BigDecimal; import java.sql.SQLException; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class SubqueriesBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetExtension.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetExtension.java new file mode 100644 index 0000000000..268f5b7a57 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetExtension.java @@ -0,0 +1,39 @@ +package com.querydsl.sql; + +import com.querydsl.core.Target; +import com.querydsl.core.testutil.ExcludeIn; +import com.querydsl.core.testutil.IncludeIn; +import java.util.Arrays; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; + +/** + * JUnit 5 replacement for the former {@code TargetRule}. Disables a test (or container) when the + * configured {@link Target} is excluded via {@link ExcludeIn} or not part of {@link IncludeIn}. + */ +public class TargetExtension implements ExecutionCondition { + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + var target = Connections.getTarget(); + if (target == null) { + return ConditionEvaluationResult.enabled("No target configured"); + } + var element = context.getElement().orElse(null); + if (element == null) { + return ConditionEvaluationResult.enabled("No annotated element"); + } + // excluded in given targets + var ex = element.getAnnotation(ExcludeIn.class); + if (ex != null && Arrays.asList(ex.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Excluded in target " + target); + } + // included only in given targets + var in = element.getAnnotation(IncludeIn.class); + if (in != null && !Arrays.asList(in.value()).contains(target)) { + return ConditionEvaluationResult.disabled("Not included in target " + target); + } + return ConditionEvaluationResult.enabled("Enabled for target " + target); + } +} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java deleted file mode 100644 index ecff49af88..0000000000 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TargetRule.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.querydsl.sql; - -import com.querydsl.core.Target; -import com.querydsl.core.testutil.EmptyStatement; -import com.querydsl.core.testutil.ExcludeIn; -import com.querydsl.core.testutil.IncludeIn; -import java.util.Arrays; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -public class TargetRule implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - var target = Connections.getTarget(); - var run = target == null || isExecuted(description, target); - return run ? base : EmptyStatement.DEFAULT; - } - - private boolean isExecuted(Description description, Target target) { - var ex = description.getAnnotation(ExcludeIn.class); - // excluded in given targets - if (ex != null && Arrays.asList(ex.value()).contains(target)) { - return false; - } - // included only in given targets - var in = description.getAnnotation(IncludeIn.class); - if (in != null && !Arrays.asList(in.value()).contains(target)) { - return false; - } - return true; - } -} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java index 9090413ad8..3624d8113a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplateTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.StringExpression; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TemplateTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java index fd1a969b84..e4d00ed7e4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TemplatesTest.java @@ -14,7 +14,7 @@ package com.querydsl.sql; import com.querydsl.core.TemplatesTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TemplatesTest extends TemplatesTestBase { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java index c51e629c0e..571b69dbf2 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TeradataTemplatesTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Ops; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TeradataTemplatesTest extends AbstractSQLTemplatesTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java index 92cafd6967..8d90454c63 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java @@ -14,7 +14,7 @@ import java.sql.SQLException; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class TypesBase extends AbstractBaseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java index 06ba03baa2..a641d1fe9e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionBase.java @@ -21,8 +21,8 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public abstract class UnionBase extends AbstractBaseTest { @@ -170,7 +170,7 @@ public void union4() { @SuppressWarnings("unchecked") @Test @ExcludeIn({DERBY, CUBRID, FIREBIRD, TERADATA}) - @Ignore // FIXME + @Disabled // FIXME 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) diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java index 8bf62d51ff..dda74107ee 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UnionSubQueryTest.java @@ -23,7 +23,7 @@ import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.core.types.dsl.SimpleExpression; import com.querydsl.core.types.dsl.SimplePath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnionSubQueryTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java index bf88e6880d..a82749c28b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java @@ -35,9 +35,9 @@ import java.sql.SQLException; import java.util.Collections; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public abstract class UpdateBase extends AbstractBaseTest { @@ -46,12 +46,12 @@ protected void reset() throws SQLException { insert(survey).values(1, "Hello World", "Hello").execute(); } - @Before + @BeforeEach public void setUp() throws SQLException { reset(); } - @After + @AfterEach public void tearDown() throws SQLException { reset(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java index 2a18f90e6b..4eb2ee1814 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WindowFunctionTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WindowFunctionTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java index 5dad0d8d75..6d0738fcbf 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/WithinGroupTest.java @@ -5,8 +5,8 @@ import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class WithinGroupTest { NumberPath path = null; @@ -16,7 +16,7 @@ private static String toString(Expression e) { return new SQLSerializer(Configuration.DEFAULT).handle(e).toString(); } - @Before + @BeforeEach public void setPaths() { this.path = Expressions.numberPath(Long.class, "path"); this.path2 = Expressions.numberPath(Long.class, "path2"); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java index 1b633a3a3c..58b187bd9b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AbstractMapperTest.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractMapperTest { @@ -49,7 +49,7 @@ public static class EmployeeNames { protected Employee employee; - @Before + @BeforeEach public void setUp() { employee = new Employee(); employee.setDatefield(new Date(0)); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java index 86e84af1dc..2e4d7aa4d2 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/AnnotationMapperTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.sql.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnnotationMapperTest extends AbstractMapperTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java index af7c52948f..39b7eed6eb 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/BeanMapperTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.sql.domain.QEmployee; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BeanMapperTest extends AbstractMapperTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java index 19c9d19d79..473f7001c1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/DefaultMapperTest.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultMapperTest extends AbstractMapperTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java index 4a883f013a..9ae2c6344b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLDeleteClauseTest.java @@ -1,30 +1,39 @@ package com.querydsl.sql.dml; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.sql.KeyAccessorsTest.QEmployee; import com.querydsl.sql.SQLTemplates; import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class SQLDeleteClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1); - delete.where(emp1.id.eq(1)); - delete.execute(); + assertThrows( + IllegalStateException.class, + () -> { + var emp1 = new QEmployee("emp1"); + var delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1); + delete.where(emp1.id.eq(1)); + delete.execute(); + }); } - @Test(expected = IllegalArgumentException.class) - @Ignore + @Test + @Disabled public void error() { - var emp1 = new QEmployee("emp1"); - var emp2 = new QEmployee("emp2"); - var delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1); - delete.where(emp2.id.eq(1)); + assertThrows( + IllegalArgumentException.class, + () -> { + var emp1 = new QEmployee("emp1"); + var emp2 = new QEmployee("emp2"); + var delete = new SQLDeleteClause(null, SQLTemplates.DEFAULT, emp1); + delete.where(emp2.id.eq(1)); + }); } @Test diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java index a5cb9f3f41..580af117ab 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLInsertClauseTest.java @@ -1,21 +1,26 @@ package com.querydsl.sql.dml; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.QueryFlag; import com.querydsl.sql.KeyAccessorsTest.QEmployee; import com.querydsl.sql.SQLTemplates; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLInsertClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1); - insert.set(emp1.id, 1); - insert.execute(); + assertThrows( + IllegalStateException.class, + () -> { + var emp1 = new QEmployee("emp1"); + var insert = new SQLInsertClause(null, SQLTemplates.DEFAULT, emp1); + insert.set(emp1.id, 1); + insert.execute(); + }); } @Test diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java index 43f80e2ae6..d6bf62a1a9 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLMergeClauseTest.java @@ -4,7 +4,7 @@ import com.querydsl.sql.H2Templates; import com.querydsl.sql.KeyAccessorsTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLMergeClauseTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java index 8f41be868f..a05798b22c 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/dml/SQLUpdateClauseTest.java @@ -2,21 +2,26 @@ import static com.querydsl.sql.SQLExpressions.select; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.QueryFlag.Position; import com.querydsl.sql.KeyAccessorsTest.QEmployee; import com.querydsl.sql.SQLTemplates; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLUpdateClauseTest { - @Test(expected = IllegalStateException.class) + @Test public void noConnection() { - var emp1 = new QEmployee("emp1"); - var update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1); - update.set(emp1.id, 1); - update.execute(); + assertThrows( + IllegalStateException.class, + () -> { + var emp1 = new QEmployee("emp1"); + var update = new SQLUpdateClause(null, SQLTemplates.DEFAULT, emp1); + update.set(emp1.id, 1); + update.execute(); + }); } @Test diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java index bb4553d0dc..b6403a0aca 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/GeneratedKeysH2Test.java @@ -23,9 +23,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Collections; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class GeneratedKeysH2Test { @@ -33,7 +33,7 @@ public class GeneratedKeysH2Test { private Statement stmt; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { Class.forName("org.h2.Driver"); var url = "jdbc:h2:./target/h2-gen;MODE=legacy"; @@ -41,7 +41,7 @@ public void setUp() throws ClassNotFoundException, SQLException { stmt = conn.createStatement(); } - @After + @AfterEach public void tearDown() throws SQLException { try { stmt.close(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java index 8a5380da09..a6b3d73cc4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/h2/H2QueryTest.java @@ -3,8 +3,8 @@ import com.querydsl.sql.H2Templates; import com.querydsl.sql.SQLQuery; import com.querydsl.sql.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class H2QueryTest { @@ -12,7 +12,7 @@ public class H2QueryTest { private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new SQLQuery(H2Templates.builder().newLineToSingleSpace().build()); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java index 77d361e02e..e499e74606 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/hsqldb/HsqldbQueryTest.java @@ -3,8 +3,8 @@ import com.querydsl.sql.HSQLDBTemplates; import com.querydsl.sql.SQLQuery; import com.querydsl.sql.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class HsqldbQueryTest { @@ -12,7 +12,7 @@ public class HsqldbQueryTest { private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new SQLQuery(HSQLDBTemplates.builder().newLineToSingleSpace().build()); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java index f0528b8e65..27777c2878 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/SQLServerQueryTest.java @@ -18,7 +18,7 @@ import com.querydsl.sql.SQLServerTemplates; import com.querydsl.sql.domain.QEmployee; import com.querydsl.sql.domain.QSurvey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SQLServerQueryTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java index 9db83bdef7..79b31ad892 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mssql/WindowFunctionTest.java @@ -21,7 +21,7 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.SQLSerializer; import com.querydsl.sql.SQLTemplates; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class WindowFunctionTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java index db7e004aa5..0e2b126ba7 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/GeneratedKeysMySQLTest.java @@ -15,7 +15,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.H2Templates; import com.querydsl.sql.QGeneratedKeysEntity; import com.querydsl.sql.dml.SQLInsertClause; @@ -23,19 +22,19 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class GeneratedKeysMySQLTest { private Connection conn; private Statement stmt; - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { Class.forName("com.mysql.jdbc.Driver"); var url = "jdbc:mysql://localhost:3306/querydsl"; @@ -43,7 +42,7 @@ public void setUp() throws ClassNotFoundException, SQLException { stmt = conn.createStatement(); } - @After + @AfterEach public void tearDown() throws SQLException { try { stmt.close(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java index 18c92a47a9..77229ab6b1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryFactoryTest.java @@ -21,14 +21,14 @@ import java.sql.Connection; import java.util.function.Supplier; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MySQLQueryFactoryTest { private MySQLQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { Supplier provider = () -> EasyMock.createNiceMock(Connection.class); queryFactory = new MySQLQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java index 89bcee07eb..6f0331fdf4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/mysql/MySQLQueryTest.java @@ -18,15 +18,15 @@ import com.querydsl.sql.MySQLTemplates; import com.querydsl.sql.domain.QSurvey; import java.io.File; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MySQLQueryTest { private MySQLQuery query; private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new MySQLQuery(null, MySQLTemplates.builder().newLineToSingleSpace().build()); query.from(survey); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java index e7b1b15df0..248286eab0 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleGrammarTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OracleGrammarTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java index 768b722590..19b6ece2a8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryFactoryTest.java @@ -20,14 +20,14 @@ import java.sql.Connection; import java.util.function.Supplier; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class OracleQueryFactoryTest { private OracleQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { Supplier provider = () -> EasyMock.createNiceMock(Connection.class); queryFactory = new OracleQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java index 215aacf0f0..da129a8bef 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/oracle/OracleQueryTest.java @@ -17,8 +17,8 @@ import com.querydsl.sql.OracleTemplates; import com.querydsl.sql.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class OracleQueryTest { @@ -26,7 +26,7 @@ public class OracleQueryTest { private QSurvey survey = new QSurvey("survey"); - @Before + @BeforeEach public void setUp() { query = new OracleQuery(null, OracleTemplates.builder().newLineToSingleSpace().build()); query.from(survey); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java index 54f77bbd9d..bf91b51199 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryFactoryTest.java @@ -20,14 +20,14 @@ import java.sql.Connection; import java.util.function.Supplier; import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class PostgreSQLQueryFactoryTest { private PostgreSQLQueryFactory queryFactory; - @Before + @BeforeEach public void setUp() { Supplier provider = () -> EasyMock.createNiceMock(Connection.class); queryFactory = new PostgreSQLQueryFactory(SQLTemplates.DEFAULT, provider); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java index f45b61b23a..e6eee9de62 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/postgresql/PostgreSQLQueryTest.java @@ -5,8 +5,8 @@ import com.querydsl.sql.PostgreSQLTemplates; import com.querydsl.sql.domain.QEmployee; import com.querydsl.sql.domain.QSurvey; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class PostgreSQLQueryTest { @@ -16,7 +16,7 @@ public class PostgreSQLQueryTest { private QEmployee employee = new QEmployee("employee"); - @Before + @BeforeEach public void setUp() { query = new PostgreSQLQuery( diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java index e6b9cc8e49..58770182c7 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/AbstractSuite.java @@ -2,14 +2,11 @@ import com.querydsl.sql.Connections; import java.sql.SQLException; -import org.junit.AfterClass; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; -@RunWith(Enclosed.class) public abstract class AbstractSuite { - @AfterClass + @AfterAll public static void tearDown() throws SQLException { Connections.close(); } diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java index 24b014c1d2..8d31d6bb63 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.CUBRID; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.CUBRIDTemplates; import com.querydsl.sql.Connections; @@ -14,37 +13,49 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Ignore -@Category(CUBRID.class) +@Disabled +@Tag("com.querydsl.core.testutil.CUBRID") public class CUBRIDLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initCubrid(); Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java index a86e130a71..c9c8580a00 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.CUBRID; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.CUBRIDTemplates; import com.querydsl.sql.Connections; @@ -14,37 +13,49 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Ignore -@Category(CUBRID.class) +@Disabled +@Tag("com.querydsl.core.testutil.CUBRID") public class CUBRIDSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initCubrid(); Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java index 58c85aab7e..f3854e7215 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2LiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.DB2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DB2Templates; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(DB2.class) +@Tag("com.querydsl.core.testutil.DB2") public class DB2LiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initDB2(); Connections.initConfiguration(DB2Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java index 0f1cb4a625..b14d68b40d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DB2SuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.DB2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DB2Templates; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(DB2.class) +@Tag("com.querydsl.core.testutil.DB2") public class DB2SuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initDB2(); Connections.initConfiguration(DB2Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java index 32f274ceeb..6e0555b93e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbyLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Derby; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class DerbyLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initDerby(); Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java index 27d1912942..b453c9d666 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/DerbySuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Derby; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class DerbySuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initDerby(); Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java index 38fb8814d2..6751a26827 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Firebird; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Firebird.class) +@Tag("com.querydsl.core.testutil.Firebird") public class FirebirdLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initFirebird(); Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java index a337e81811..fad5e0b4d4 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/FirebirdSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Firebird; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Firebird.class) +@Tag("com.querydsl.core.testutil.Firebird") public class FirebirdSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initFirebird(); Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java index 1972cbdd25..578689ac3b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2ExceptionSuiteTest.java @@ -4,24 +4,23 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.QueryException; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.AbstractBaseTest; import com.querydsl.sql.Connections; import com.querydsl.sql.DefaultSQLExceptionTranslator; import com.querydsl.sql.H2Templates; import com.querydsl.sql.SQLExceptionTranslator; import java.sql.SQLException; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2ExceptionSuiteTest extends AbstractBaseTest { private static final SQLExceptionTranslator exceptionTranslator = DefaultSQLExceptionTranslator.DEFAULT; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2Templates.builder().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java index 472a8f9040..f45a0dbe7e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2LiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -15,37 +14,50 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2LiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java index 6890c92f36..c4a10c0a30 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2SuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -15,37 +14,50 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2SuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java index b0c88dabce..c60f3fdf28 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithQuotingTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2WithQuotingTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration(H2Templates.builder().quote().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java index 55bacc0ae2..4bdca4287b 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/H2WithSchemaTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -15,37 +14,50 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class H2WithSchemaTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initH2(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java index ef289d439e..ef5bb130a8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.HSQLDB; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(HSQLDB.class) +@Tag("com.querydsl.core.testutil.HSQLDB") public class HsqldbLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initHSQL(); Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java index cbc3b151a4..8c142469cd 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/HsqldbSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.HSQLDB; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(HSQLDB.class) +@Tag("com.querydsl.core.testutil.HSQLDB") public class HsqldbSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initHSQL(); Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java index 1c77203d13..e32a8e50c8 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLServer(); Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java index d38354a264..23f0a4cea1 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MSSQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class MSSQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLServer(); Connections.initConfiguration(SQLServer2008Templates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java index 5095b24878..88b0830a54 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -15,37 +14,50 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectMySQL extends SelectMySQLBase {} + @Nested + class SelectMySQL extends SelectMySQLBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initMySQL(); Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java index 9fc44fca36..e352d0691d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -15,37 +14,50 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectMySQL extends SelectMySQLBase {} + @Nested + class SelectMySQL extends SelectMySQLBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initMySQL(); Connections.initConfiguration(MySQLTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java index 1cd9da056a..25b92ff8be 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/MySQLWithQuotingTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class MySQLWithQuotingTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initMySQL(); Connections.initConfiguration(MySQLTemplates.builder().quote().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java index 5f12782cc4..93f87bf1b0 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Oracle; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Oracle.class) +@Tag("com.querydsl.core.testutil.Oracle") public class OracleLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectOracle extends SelectOracleBase {} + @Nested + class SelectOracle extends SelectOracleBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initOracle(); Connections.initConfiguration(OracleTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java index 0ad02c1cd6..1d93545df6 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Oracle; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -16,39 +15,53 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Oracle.class) +@Tag("com.querydsl.core.testutil.Oracle") public class OracleSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectOracle extends SelectOracleBase {} + @Nested + class SelectOracle extends SelectOracleBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initOracle(); Connections.initConfiguration(OracleTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java index 5b8e7977c0..63a30e6975 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/OracleWithQuotingTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.Oracle; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(Oracle.class) +@Tag("com.querydsl.core.testutil.Oracle") public class OracleWithQuotingTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initOracle(); Connections.initConfiguration(OracleTemplates.builder().quote().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java index ce5c15c3ed..2aa205fe8d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Configuration; import com.querydsl.sql.Connections; @@ -17,22 +16,30 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase { + @Nested + class KeywordQuoting extends KeywordQuotingBase { private Configuration previous; + @BeforeEach @Override public void setUp() throws Exception { // NOTE: replacing the templates with a non-quoting one @@ -42,6 +49,7 @@ public void setUp() throws Exception { super.setUp(); } + @AfterEach @Override public void tearDown() throws Exception { super.tearDown(); @@ -50,25 +58,34 @@ public void tearDown() throws Exception { } } - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initPostgreSQL(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java index 67f367c857..f7fff0b9c3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/PostgreSQLSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Configuration; import com.querydsl.sql.Connections; @@ -17,22 +16,30 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class PostgreSQLSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase { + @Nested + class KeywordQuoting extends KeywordQuotingBase { private Configuration previous; + @BeforeEach @Override public void setUp() throws Exception { // NOTE: replacing the templates with a non-quoting one @@ -42,6 +49,7 @@ public void setUp() throws Exception { super.setUp(); } + @AfterEach @Override public void tearDown() throws Exception { super.tearDown(); @@ -50,25 +58,34 @@ public void tearDown() throws Exception { } } - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class MergeUsing extends MergeUsingBase {} + @Nested + class MergeUsing extends MergeUsingBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + @Nested + class SelectWindowFunctions extends SelectWindowFunctionsBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initPostgreSQL(); Connections.initConfiguration( diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java index 1fc5de3109..d7c592ca03 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteLiteralsSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.SQLite; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLite.class) +@Tag("com.querydsl.core.testutil.SQLite") public class SQLiteLiteralsSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLite(); Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java index 6c65307d15..c47aa7b927 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/SQLiteSuiteTest.java @@ -1,6 +1,5 @@ package com.querydsl.sql.suites; -import com.querydsl.core.testutil.SQLite; import com.querydsl.sql.BeanPopulationBase; import com.querydsl.sql.Connections; import com.querydsl.sql.DeleteBase; @@ -14,35 +13,47 @@ import com.querydsl.sql.TypesBase; import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; -@Category(SQLite.class) +@Tag("com.querydsl.core.testutil.SQLite") public class SQLiteSuiteTest extends AbstractSuite { - public static class BeanPopulation extends BeanPopulationBase {} + @Nested + class BeanPopulation extends BeanPopulationBase {} - public static class Delete extends DeleteBase {} + @Nested + class Delete extends DeleteBase {} - public static class Insert extends InsertBase {} + @Nested + class Insert extends InsertBase {} - public static class KeywordQuoting extends KeywordQuotingBase {} + @Nested + class KeywordQuoting extends KeywordQuotingBase {} - public static class LikeEscape extends LikeEscapeBase {} + @Nested + class LikeEscape extends LikeEscapeBase {} - public static class Merge extends MergeBase {} + @Nested + class Merge extends MergeBase {} - public static class Select extends SelectBase {} + @Nested + class Select extends SelectBase {} - public static class Subqueries extends SubqueriesBase {} + @Nested + class Subqueries extends SubqueriesBase {} - public static class Types extends TypesBase {} + @Nested + class Types extends TypesBase {} - public static class Union extends UnionBase {} + @Nested + class Union extends UnionBase {} - public static class Update extends UpdateBase {} + @Nested + class Update extends UpdateBase {} - @BeforeClass + @BeforeAll public static void setUp() throws Exception { Connections.initSQLite(); Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java index bbb6abcc0e..284cfc123a 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/teradata/SetQueryBandClauseTest.java @@ -5,8 +5,8 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.SQLTemplates; import java.sql.Connection; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SetQueryBandClauseTest { @@ -14,7 +14,7 @@ public class SetQueryBandClauseTest { private SetQueryBandClause clause; - @Before + @BeforeEach public void setUp() { conf = new Configuration(SQLTemplates.DEFAULT); conf.setUseLiterals(true); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java index f31e237d4a..d90e3d9992 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/ArrayTypeTest.java @@ -8,7 +8,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ArrayTypeTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java index dcf1ef8a14..ea7eaabe85 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocalDateTimeTest.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import java.time.LocalDateTime; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LocalDateTimeTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java index 883b854e55..d696c70478 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/LocaleTypeTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LocaleTypeTest { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java index b50135c6cf..de820f7389 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/types/TypeTest.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.UUID; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeTest implements InvocationHandler { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java index 54f1ed4457..a8cd093332 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java @@ -17,12 +17,11 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BooleanExtensionsTest extends AbstractProcessorTest { @@ -37,10 +36,8 @@ public void process() throws IOException { process(QuerydslAnnotationProcessor.class, sources, "booleanExtensions"); var qtypeContent = - new String( - Files.readAllBytes( - Path.of("target", "booleanExtensions", "com", "querydsl", "QExampleEntity.java")), - StandardCharsets.UTF_8); + Files.readString( + Path.of("target", "booleanExtensions", "com", "querydsl", "QExampleEntity.java")); assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp"); assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp2"); } @@ -53,10 +50,8 @@ public void process2() throws IOException { new File(packagePath, "ExampleEntity.java").getPath()); process(QuerydslAnnotationProcessor.class, sources, "booleanExtensions2"); var qtypeContent = - new String( - Files.readAllBytes( - Path.of("target", "booleanExtensions2", "com", "querydsl", "QExampleEntity.java")), - StandardCharsets.UTF_8); + Files.readString( + Path.of("target", "booleanExtensions2", "com", "querydsl", "QExampleEntity.java")); assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp"); assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp2"); } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java index 82cab4c47d..020b5ee74d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/DateExtensionsTest.java @@ -17,16 +17,15 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class DateExtensionsTest extends AbstractProcessorTest { private static final String packagePath = "src/test/java/com/querydsl/apt/"; @@ -43,8 +42,7 @@ public void handles_date_extensions_correctly() throws IOException, InterruptedE assertThat(qType).exists(); var modified = qType.lastModified(); Thread.sleep(1000); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("QDate"); + assertThat(Files.readString(qType.toPath())).contains("QDate"); // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten compile(QuerydslAnnotationProcessor.class, sources, "overwrite3"); @@ -56,15 +54,13 @@ public void handles_date_extensions_correctly() throws IOException, InterruptedE assertThat(modified < qType.lastModified()) .as("" + modified + " >= " + qType.lastModified()) .isTrue(); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("QDate"); + assertThat(Files.readString(qType.toPath())).contains("QDate"); // QEntityWithExtensions is deleted and regenerated assertThat(qType.delete()).isTrue(); compile(QuerydslAnnotationProcessor.class, sources, "overwrite3"); assertThat(qType).exists(); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("QDate"); + assertThat(Files.readString(qType.toPath())).contains("QDate"); } @Override diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java index a2494dd8c2..039c5ab987 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EclipseCompilationTest.java @@ -20,21 +20,20 @@ import com.querydsl.core.util.FileUtils; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import javax.tools.JavaCompiler; import org.eclipse.jdt.internal.compiler.tool.EclipseCompiler; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class EclipseCompilationTest { private static final String packagePath = "src/test/apt/com/querydsl/eclipse/"; @Test - @Ignore + @Disabled public void test() throws IOException { System.setProperty("jdt.compiler.useSingleThread", "true"); // select classes @@ -78,7 +77,7 @@ public void test() throws IOException { var resultFile = new File("target/out-eclipse/com/querydsl/eclipse/QSimpleEntity.java"); assertThat(resultFile).exists(); - var result = new String(Files.readAllBytes(resultFile.toPath()), StandardCharsets.UTF_8); + var result = Files.readString(resultFile.toPath()); assertThat(result).contains("NumberPath bigDecimalProp"); assertThat(result).contains("NumberPath integerProp"); assertThat(result).contains("NumberPath intProp"); diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java index c99b2e32b5..3a47a6f4d1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EmbeddableTest.java @@ -16,7 +16,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EmbeddableTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java index d371f04098..f3174a6e55 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/EntityExtensionsTest.java @@ -17,16 +17,15 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class EntityExtensionsTest extends AbstractProcessorTest { private static final String packagePath = "src/test/java/com/querydsl/apt/"; @@ -43,8 +42,7 @@ public void handles_entity_extensions_correctly() throws IOException, Interrupte assertThat(qType).exists(); var modified = qType.lastModified(); Thread.sleep(1000); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("extension()"); + assertThat(Files.readString(qType.toPath())).contains("extension()"); // EntityWithExtensions has not changed, QEntityWithExtensions is not overwritten compile(QuerydslAnnotationProcessor.class, sources, "overwrite2"); @@ -56,15 +54,13 @@ public void handles_entity_extensions_correctly() throws IOException, Interrupte assertThat(modified < qType.lastModified()) .as("" + modified + " >= " + qType.lastModified()) .isTrue(); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("extension()"); + assertThat(Files.readString(qType.toPath())).contains("extension()"); // QEntityWithExtensions is deleted and regenerated assertThat(qType.delete()).isTrue(); compile(QuerydslAnnotationProcessor.class, sources, "overwrite2"); assertThat(qType).exists(); - assertThat(new String(Files.readAllBytes(qType.toPath()), StandardCharsets.UTF_8)) - .contains("extension()"); + assertThat(Files.readString(qType.toPath())).contains("extension()"); } @Override diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java index b3742e80e5..eef64c6a25 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedClassesTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExcludedClassesTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java index 5e7f19638c..5001017f0a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/ExcludedPackagesTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExcludedPackagesTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java index b5ef81e61c..089d44c499 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericExporterTest.java @@ -17,11 +17,10 @@ import jakarta.persistence.Transient; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericExporterTest extends AbstractProcessorTest { @@ -136,8 +135,8 @@ private void execute(List expected, String genericExporterFolder, String if (!other.exists() || !other.isFile()) { continue; } - var result1 = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); - var result2 = new String(Files.readAllBytes(other.toPath()), StandardCharsets.UTF_8); + var result1 = Files.readString(file.toPath()); + var result2 = Files.readString(other.toPath()); if (!result1.equals(result2)) { if (!expected.contains(file.getName())) { System.err.println(file.getName()); diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java index 1357777390..9ad066c6ca 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/GenericTest.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java index 63a8678151..90d299029e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedClassesTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IncludedClassesTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java index 64a25ce1e5..1af0e847a8 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncludedPackagesTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IncludedPackagesTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java index e1709ffbe4..a8dee075af 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IncrementalCompilationTest.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.nio.file.Files; import java.util.Collections; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class IncrementalCompilationTest extends AbstractProcessorTest { private static final String packagePath = "src/test/java/com/querydsl/apt/domain/"; diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java index 48f6e42ccc..cdede27799 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java @@ -4,12 +4,11 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IntegerExtensionsTest extends AbstractProcessorTest { @@ -23,10 +22,8 @@ public void process() throws IOException { new File(packagePath, "ExampleEntity2.java").getPath()); process(QuerydslAnnotationProcessor.class, sources, "integerExtensions"); var qtypeContent = - new String( - Files.readAllBytes( - Path.of("target", "integerExtensions", "com", "querydsl", "QExampleEntity2.java")), - StandardCharsets.UTF_8); + Files.readString( + Path.of("target", "integerExtensions", "com", "querydsl", "QExampleEntity2.java")); // The superclass' id property is inherited, but can't be assigned to the custom QInteger assertThat(qtypeContent) .contains( diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java index e1fe5e5f1b..cd9f944405 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NamePrefixTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NamePrefixTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java index c154d6b571..7e847bf09f 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NameSuffixTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NameSuffixTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java index 7529c99035..a844593a20 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/NoteTest.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NoteTest extends AbstractProcessorTest { @@ -31,28 +31,33 @@ protected ByteArrayOutputStream getStdErr() { return err; } - protected boolean isStdErrEmpty() { - return getStdErr().toByteArray().length == 0; + /** + * Whether the processor emitted info-level notes (controlled by {@code querydsl.logInfo}). Cannot + * simply check that stderr is empty: the processor also reports unrelated warnings (e.g. circular + * Q-class references) regardless of the logInfo option. + */ + protected boolean hasInfoNotes() { + return getStdErr().toString().contains("Note:"); } @Test public void processDefault() throws IOException { aptOptions = Collections.emptyList(); process(); - assertThat(isStdErrEmpty()).isTrue(); + assertThat(hasInfoNotes()).isFalse(); } @Test public void processEnabled() throws IOException { aptOptions = Collections.singletonList("-Aquerydsl.logInfo=true"); process(); - assertThat(isStdErrEmpty()).isFalse(); + assertThat(hasInfoNotes()).isTrue(); } @Test public void processDisabled() throws IOException { aptOptions = Collections.singletonList("-Aquerydsl.logInfo=false"); process(); - assertThat(isStdErrEmpty()).isTrue(); + assertThat(hasInfoNotes()).isFalse(); } } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java index a70898c619..737bc3a370 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/PackageSuffixTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PackageSuffixTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java index 751d3a3857..6e2e915b5a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/QuerydslAnnotationProcessorTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuerydslAnnotationProcessorTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java index d2aeba894b..4c24577d84 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/UnknownAsEmbeddableTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnknownAsEmbeddableTest extends AbstractProcessorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java index 9bdcf5bdbb..7b57c780a0 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClasses2Test.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings({"rawtypes", "serial", "unchecked"}) public class AbstractClasses2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java index 5354715a1a..272b6b9312 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractClassesTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings({"rawtypes", "serial", "unchecked"}) public class AbstractClassesTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java index 750e59e3ab..57f583d67d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractEntityTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AbstractEntityTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java index 17b75af760..53e606bd8c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties2Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AbstractProperties2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java index 96e7275c1e..5f246f19fa 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractProperties3Test.java @@ -17,10 +17,10 @@ import java.io.Serializable; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class AbstractProperties3Test { @MappedSuperclass diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java index 737541357f..257d16a1eb 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AbstractPropertiesTest.java @@ -15,9 +15,9 @@ import jakarta.persistence.Entity; import java.io.Serializable; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class AbstractPropertiesTest { public abstract static class GenericEntity> { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java index d81b93da7b..a49049287d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnimalTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnimalTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java index 2853407666..eb461a8d0e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotatedGettersTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnnotatedGettersTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java index 11339ebcac..d53f912f4d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnnotationTypeTest.java @@ -6,9 +6,9 @@ import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import java.lang.annotation.Annotation; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class AnnotationTypeTest { @MappedSuperclass diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java index 1109c23bb0..490fcc2473 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyPathTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.OneToMany; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnyPathTest { @Entity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java index eaa3e62eb1..012ef2feb1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/AnyUsageTest.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AnyUsageTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java index 9a7dd23b51..19d335f74f 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array2Test.java @@ -2,7 +2,7 @@ import com.querydsl.core.annotations.QueryProjection; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Array2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java index 8c28a697ae..b36c5325ca 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Array3Test.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Array3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java index 5ab3d461c6..7a4dee92bf 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayExtTest.java @@ -23,7 +23,7 @@ import com.querydsl.core.types.dsl.StringPath; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ArrayExtTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java index 0fa515661e..97ed5aa3ff 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ArrayTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ArrayTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java index c77b825be8..4eacb45993 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/BlockingTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryTransient; import com.querydsl.core.annotations.QueryType; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BlockingTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java index 8da32f4e00..8e7607ba91 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/CollectionTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollectionTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java index f8eae7109c..2e206899fa 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ComparableTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ComparableTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java index 7dc116292e..beb1f5efc5 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ConstructorTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConstructorTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java index 8d193f04f5..03474bb72a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DeepInitializationTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.OneToOne; import jakarta.persistence.SequenceGenerator; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DeepInitializationTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java index d1c3b9f52c..eb7a27a0f4 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate2Test.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.Path; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.NumberExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Delegate2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java index f448ea3416..aee3dd5dd3 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Delegate3Test.java @@ -4,7 +4,7 @@ import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.ComparablePath; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Delegate3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java index 65e69ef4ac..5d7e47390c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/DelegateTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.Expression; import com.querydsl.core.types.dsl.StringPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DelegateTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java index 0e2762526c..e2a64151cb 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable2Test.java @@ -21,8 +21,8 @@ import com.querydsl.core.domain.MyEmbeddable; import com.querydsl.core.types.PathMetadata; import com.querydsl.core.types.dsl.PathInits; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class Embeddable2Test { @@ -42,7 +42,7 @@ public abstract static class SomeEntityClassHavingMyEmbeddable { public static class SomeEntity extends SomeMappedSuperClassHavingMyEmbeddable {} @Test - @Ignore + @Disabled public void mapped_superClass_constructors() throws SecurityException, NoSuchMethodException { assertThat( QEmbeddable2Test_SomeMappedSuperClassHavingMyEmbeddable.class.getConstructor( @@ -51,7 +51,7 @@ public void mapped_superClass_constructors() throws SecurityException, NoSuchMet } @Test - @Ignore + @Disabled public void entity_constructors() throws SecurityException, NoSuchMethodException { assertThat( QEmbeddable2Test_SomeEntityClassHavingMyEmbeddable.class.getConstructor( diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java index ef34dddc9f..32ed86a5c8 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embeddable3Test.java @@ -3,7 +3,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryProjection; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Embeddable3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java index c1c658cb17..6bb9a5bfbc 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableDeepTest.java @@ -18,9 +18,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled @SuppressWarnings("serial") public class EmbeddableDeepTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java index 38dc1be928..64527509f5 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableInterfaceTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EmbeddableInterfaceTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java index 3d80c3dd92..eeae7891c1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddableTest.java @@ -17,9 +17,9 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; import java.util.List; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class EmbeddableTest { @QueryEntity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java index 6df7c33c55..45e0817497 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Embedded2Test.java @@ -21,7 +21,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Embedded2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java index 33e9f29df4..8723b10512 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EmbeddedTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EmbeddedTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java index 75b607fdc5..fea5abbfea 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityInheritanceTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EntityInheritanceTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java index 951e503f71..a307ce56e2 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EntityTest.java @@ -14,13 +14,14 @@ package com.querydsl.apt.domain; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; import com.querydsl.core.annotations.QuerySupertype; import com.querydsl.core.types.PathMetadata; import com.querydsl.core.types.dsl.PathInits; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EntityTest extends AbstractTest { @@ -99,9 +100,13 @@ public void constructors() throws SecurityException, NoSuchMethodException { QEntityTest_Supertype2.class.getConstructor(types); } - @Test(expected = NoSuchMethodException.class) - public void constructors2() throws SecurityException, NoSuchMethodException { - var types = new Class[] {Class.class, PathMetadata.class, PathInits.class}; - QEntityTest_EntityNoReferences.class.getConstructor(types); + @Test + public void constructors2() throws SecurityException { + assertThrows( + NoSuchMethodException.class, + () -> { + var types = new Class[] {Class.class, PathMetadata.class, PathInits.class}; + QEntityTest_EntityNoReferences.class.getConstructor(types); + }); } } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java index 514e738a7d..158e484910 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum2Test.java @@ -14,9 +14,9 @@ package com.querydsl.apt.domain; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class Enum2Test { @QueryEntity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java index 0f1c59300f..66ad55905b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum3Test.java @@ -3,7 +3,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Enumerated; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Enum3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java index 9ae0936bad..c86d3e2377 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Enum4Test.java @@ -2,9 +2,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class Enum4Test { @Entity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java index 424c3f0a6d..a0c8a768b4 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/EnumTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EnumTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java index 3184b38381..2c749ae84c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExcludedClassTest.java @@ -13,9 +13,11 @@ */ package com.querydsl.apt.domain; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryExclude; -import org.junit.Test; +import org.junit.jupiter.api.Test; @QueryExclude @QueryEntity @@ -25,13 +27,17 @@ public class ExcludedClassTest { @QueryEntity public static class InnerClass {} - @Test(expected = ClassNotFoundException.class) - public void outerClass() throws ClassNotFoundException { - Class.forName(getClass().getPackage().getName() + ".Q" + getClass().getSimpleName()); + @Test + public void outerClass() { + assertThrows( + ClassNotFoundException.class, + () -> Class.forName(getClass().getPackage().getName() + ".Q" + getClass().getSimpleName())); } - @Test(expected = ClassNotFoundException.class) - public void innerClass() throws ClassNotFoundException { - Class.forName(getClass().getPackage().getName() + ".QExcludedClassTest_InnerClass"); + @Test + public void innerClass() { + assertThrows( + ClassNotFoundException.class, + () -> Class.forName(getClass().getPackage().getName() + ".QExcludedClassTest_InnerClass")); } } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java index d83dc6c872..244991685a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExpressionTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExpressionTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java index 1bff276291..fe35d6ad7b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExtendsAndSuperTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExtendsAndSuperTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java index 4d81ea89f6..9b42d8a959 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEmbeddableTest.java @@ -16,9 +16,9 @@ import com.querydsl.core.domain.EmbeddableWithoutQType; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class ExternalEmbeddableTest { @Entity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java index 0f852362f6..f89cca287d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ExternalEntityTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.domain.AbstractEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExternalEntityTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java index 320b47caea..49b70513d7 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic10Test.java @@ -5,7 +5,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.OneToOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic10Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java index f657f946ad..f8480b13e6 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic11Test.java @@ -2,7 +2,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic11Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java index 5a74da8ea8..5cc5aabb35 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic12Test.java @@ -9,7 +9,7 @@ import jakarta.persistence.ManyToMany; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic12Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java index bf7ed81b0b..2ef7450ecf 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic13Test.java @@ -1,7 +1,7 @@ package com.querydsl.apt.domain; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic13Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java index 626e510e48..7ed0bc20f3 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic14Test.java @@ -5,7 +5,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic14Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java index ba27a8346d..83ec902934 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic15Test.java @@ -4,7 +4,7 @@ import jakarta.persistence.MappedSuperclass; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic15Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java index 8b794a3951..a1baa8123c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic16Test.java @@ -6,7 +6,7 @@ import jakarta.persistence.MappedSuperclass; import java.util.SortedSet; import java.util.TreeSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic16Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java index 69ab0c8c5f..46b3f247d0 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic2Test.java @@ -4,7 +4,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic2Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java index 4b42447fdc..3cc1cfd6e1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic3Test.java @@ -3,7 +3,7 @@ import com.querydsl.core.types.dsl.StringPath; import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic3Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java index a8ac6eef96..89b0f7c836 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic4Test.java @@ -1,7 +1,7 @@ package com.querydsl.apt.domain; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic4Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java index 6e41cf83ca..01648b6c20 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic5Test.java @@ -2,7 +2,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic5Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java index 0d48066016..2e53a31663 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic6Test.java @@ -1,7 +1,7 @@ package com.querydsl.apt.domain; import jakarta.persistence.Entity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic6Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java index 43532422eb..b9da273be8 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic7Test.java @@ -3,7 +3,7 @@ import com.querydsl.core.annotations.QueryEntity; import java.util.Collection; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic7Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java index c65e1ae6e5..9a705253ab 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic8Test.java @@ -5,7 +5,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic8Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java index fd2c01133a..74fa218849 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Generic9Test.java @@ -6,7 +6,7 @@ import jakarta.persistence.MappedSuperclass; import jakarta.persistence.Table; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic9Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java index 4120326376..d3908ee41e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericSignatureTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericSignatureTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java index 8557e0bbe0..9b29ba5aad 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericStackOverflowTest.java @@ -5,7 +5,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericStackOverflowTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java index 5057f06059..460f11a5b3 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/GenericTest.java @@ -20,7 +20,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryTransient; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java index 43a59ff22b..7f973edd73 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Hierarchy2Test.java @@ -19,9 +19,9 @@ import jakarta.persistence.Entity; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.OneToOne; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class Hierarchy2Test { @MappedSuperclass diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java index 747a51ae44..cf875bdeec 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/HierarchyTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryType; import jakarta.persistence.Column; import jakarta.persistence.Entity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HierarchyTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java index 3121e95035..c3868f8f2d 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InitTest.java @@ -7,7 +7,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InitTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java index 17f9f1cf4d..a6976d0e05 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java @@ -6,12 +6,11 @@ import com.querydsl.apt.QuerydslAnnotationProcessor; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InnerExtensionsTest extends AbstractProcessorTest { @@ -25,10 +24,8 @@ public void process() throws IOException { new File(packagePath, "ExampleEntity2.java").getPath()); process(QuerydslAnnotationProcessor.class, sources, "innerextensions"); var qtypeContent = - new String( - Files.readAllBytes( - Path.of("target", "innerextensions", "com", "querydsl", "QExampleEntity2.java")), - StandardCharsets.UTF_8); + Files.readString( + Path.of("target", "innerextensions", "com", "querydsl", "QExampleEntity2.java")); assertThat(qtypeContent) .contains("return InnerExtensions.ExampleEntity2Extensions.isZero(this);"); } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java index 4a2079a244..e836f25d6f 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType2Test.java @@ -12,7 +12,7 @@ import jakarta.persistence.MappedSuperclass; import jakarta.persistence.Table; import org.hibernate.annotations.NaturalId; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InterfaceType2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java index c57413a17f..59c083d6a8 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceType3Test.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InterfaceType3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java index f75349e226..500d3ded9f 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/InterfaceTypeTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.types.dsl.ListPath; import com.querydsl.core.types.dsl.NumberPath; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InterfaceTypeTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java index a5b46ad431..794536fc9b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JPATest.java @@ -16,7 +16,7 @@ import com.querydsl.core.types.dsl.StringPath; import jakarta.persistence.Entity; import jakarta.persistence.Transient; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPATest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java index 248aee1b55..64596ca53a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310Test.java @@ -9,7 +9,7 @@ import jakarta.persistence.TemporalType; import java.time.Instant; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java index 50d205a756..cd07844692 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JSR310TimeSupportTest.java @@ -23,7 +23,7 @@ import java.time.LocalTime; import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSR310TimeSupportTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java index 2d5e5c740b..62fc8e6776 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/JodaMoneyTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.joda.money.QMoney; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JodaMoneyTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java index b1ac903d9e..3119c877cf 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/KeywordsTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import jakarta.persistence.Entity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeywordsTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java index 4e8b933d1a..5f8abf8b66 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/LiteralEntityTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.types.dsl.EnumPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LiteralEntityTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java index d2da670c64..23c1b61151 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManagedEmailTest.java @@ -6,7 +6,7 @@ import jakarta.persistence.MapKey; import jakarta.persistence.OneToMany; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ManagedEmailTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java index b478e64bdd..3511013834 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ManyToManyTest.java @@ -5,7 +5,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.ManyToMany; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ManyToManyTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java index f25adee0cc..5bf04c147e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/MonitoredCompanyTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MonitoredCompanyTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java index 3055241f4f..b5197285fb 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/NumberTest.java @@ -2,9 +2,9 @@ import com.querydsl.apt.domain.custom.CustomNumber; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class NumberTest { @QueryEntity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java index 803e203e3b..fb8b1bd9fb 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OneToOneTest.java @@ -4,7 +4,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.OneToOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OneToOneTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java index 2e3889dc6b..c046b315ae 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/OrderTest.java @@ -5,7 +5,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.OneToMany; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OrderTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java index ceb4da2b23..be27431df5 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathMetadataTest.java @@ -18,14 +18,14 @@ import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.dsl.StringExpression; import java.util.Map; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class PathMetadataTest { - @Before + @BeforeEach public void setUp() { assertThat(QAnimalTest_Animal.animal).isNotNull(); assertThat(QAnimalTest_Cat.cat).isNotNull(); diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java index 62123bc2e7..39c4fb98fa 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PathTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PathTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java index faf4f6ecb4..f23233943b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PersonTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PersonTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java index 994bba5a00..31ae56a3e4 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties2Test.java @@ -1,11 +1,13 @@ package com.querydsl.apt.domain; +import static org.junit.jupiter.api.Assertions.assertThrows; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Properties2Test { @@ -29,8 +31,9 @@ public String getId() { } } - @Test(expected = NoSuchFieldException.class) - public void test() throws NoSuchFieldException { - QProperties2Test_ConcreteX.class.getDeclaredField("id"); + @Test + public void test() { + assertThrows( + NoSuchFieldException.class, () -> QProperties2Test_ConcreteX.class.getDeclaredField("id")); } } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java index bf5ca2fd4b..deced88691 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties3Test.java @@ -7,7 +7,7 @@ import jakarta.persistence.TemporalType; import java.time.LocalDateTime; import java.time.ZoneId; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Properties3Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java index f42aa5846a..d7102ab19b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Properties4Test.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import jakarta.persistence.MappedSuperclass; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Properties4Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java index 9694419027..4f5e241c5e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertiesTest.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PropertiesTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java index 11cb4301e8..8010c0b236 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/PropertyTypeTest.java @@ -16,10 +16,10 @@ import com.querydsl.core.annotations.PropertyType; import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryType; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore +@Disabled public class PropertyTypeTest { @QueryEntity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java index 2478cdd25b..4c5b235ad5 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryByExampleTest.java @@ -4,7 +4,7 @@ import com.querydsl.core.annotations.QueryDelegate; import com.querydsl.core.types.Predicate; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryByExampleTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java index 5fc43a7ec5..c82a973285 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable2Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbeddable2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java index f24f7c9d6b..c1249770d0 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddable3Test.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbeddable3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java index 414035d31d..77a65eaa0e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddableTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbeddableTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java index b75c71b402..c3b7918ab0 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded2Test.java @@ -18,7 +18,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.annotations.QueryEmbedded; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java index 6992e9e5a2..bad20866f9 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded3Test.java @@ -18,7 +18,7 @@ import com.querydsl.core.annotations.QueryEmbedded; import com.querydsl.core.annotations.QueryEntity; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java index eda639194b..d3b31487b7 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded4Test.java @@ -18,7 +18,7 @@ import com.querydsl.core.annotations.QueryEmbedded; import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded4Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java index 5db8b37819..34f3e83543 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded5Test.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded5Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java index 539beb685e..8b3a2da166 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded6Test.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.types.dsl.EntityPathBase; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded6Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java index 8042620b8f..a48867ae70 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbedded7Test.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.Locale; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbedded7Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java index cb3d387628..56a6e24014 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryEmbeddedTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryEntity; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryEmbeddedTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java index 1c6adafc85..3e638c04a7 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryExcludeTest.java @@ -18,7 +18,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryExclude; import com.querydsl.core.types.dsl.EntityPathBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryExcludeTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java index 5352ba0cbe..63ce15cd98 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit2Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java index b644db1d3a..643244766e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit3Test.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryInit; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java index c0b146c57a..f09bc0ff91 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit4Test.java @@ -6,7 +6,7 @@ import com.querydsl.core.annotations.QueryInit; import java.sql.Date; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit4Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java index fdad32ae2b..1e5d808b48 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit5Test.java @@ -4,7 +4,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit5Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java index 9417ed2257..0811cdaf27 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit6Test.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.hibernate.proxy.HibernateProxy; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit6Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java index 9fd07800a3..54acf83a60 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInit7Test.java @@ -27,7 +27,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MappedSuperclass; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInit7Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java index 1a9332842f..d0bbe31e4b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryInitTest.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryInit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryInitTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java index cb4a19122f..482006121c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionBuilderTest.java @@ -1,10 +1,10 @@ package com.querydsl.apt.domain; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryProjectionBuilderTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java index c3e459c2a9..1bbe2199f2 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryProjectionTest.java @@ -22,7 +22,7 @@ import com.querydsl.core.types.dsl.StringExpression; import jakarta.persistence.Entity; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryProjectionTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java index 13e2efb50e..0370efca9c 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeOverTransientTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QueryTransient; import com.querydsl.core.annotations.QueryType; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryTypeOverTransientTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java index 9fdc6d6a31..42c4e86cd7 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QueryTypeTest.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.DateTimePath; import com.querydsl.core.types.dsl.SimplePath; import com.querydsl.core.types.dsl.TimePath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryTypeTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java index 1867d41838..b6dcb208d1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfig2Test.java @@ -14,10 +14,11 @@ package com.querydsl.apt.domain; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.querydsl.core.annotations.Config; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuerydslConfig2Test { @@ -53,8 +54,9 @@ public void test() { assertThat(QQuerydslConfig2Test_Entity.entity).isNotNull(); } - @Test(expected = NoSuchFieldException.class) - public void create_default_variable() throws SecurityException, NoSuchFieldException { - QQuerydslConfig2Test_Entity2.class.getField("entity2"); + @Test + public void create_default_variable() throws SecurityException { + assertThrows( + NoSuchFieldException.class, () -> QQuerydslConfig2Test_Entity2.class.getField("entity2")); } } diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java index ded16d6398..035ad5adbe 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/QuerydslConfigTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryEntity; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QuerydslConfigTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java index 034088b86d..666efe1b41 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RawTest.java @@ -2,7 +2,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RawTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java index 3273e19ba8..c61cd49e06 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/RelationTest.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.SortedSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RelationTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java index 56c39b19e4..a19e7aea96 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesInTypesTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ReservedNamesInTypesTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java index 70aae5fb77..40323534af 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/ReservedNamesTest.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ReservedNamesTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java index ea19feaaa6..7ca4b25885 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SignatureTest.java @@ -18,7 +18,7 @@ import com.querydsl.core.annotations.QuerySupertype; import com.querydsl.core.types.dsl.EntityPathBase; import java.io.Serializable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignatureTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java index c16fc56991..fcee008010 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SimpleTypesTest.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SimpleTypesTest extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java index c1d92d0f4c..07d1497d9a 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass2Test.java @@ -20,7 +20,7 @@ import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PrePersist; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Superclass2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java index e9f6094fbb..f642cde420 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass3Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.DefaultQueryMetadata; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Superclass3Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java index 2be16c9815..459a58d975 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass4Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Superclass4Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java index 20299c3c15..45f944ed52 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Superclass5Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEmbeddable; import com.querydsl.core.types.PathMetadataFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Superclass5Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java index 73546b8c6e..c3398d31d2 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/SuperclassTest.java @@ -15,9 +15,9 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.annotations.QuerySupertype; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class SuperclassTest { @QuerySupertype diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java index 36bb6f3da5..25236a4312 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/Temporal2Test.java @@ -10,7 +10,7 @@ import jakarta.persistence.TemporalType; import java.math.BigDecimal; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Temporal2Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java index 42cc37302e..7519fce1fb 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TemporalTest.java @@ -8,7 +8,7 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TemporalTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java index 220aa23917..8b9e9dcc6b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/TransientTest.java @@ -19,7 +19,7 @@ import com.querydsl.core.annotations.QueryType; import jakarta.persistence.Entity; import jakarta.persistence.Transient; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TransientTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java index 101bbe8fe2..fb195fcd03 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/domain/p6/TypeTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java index dcedc6e67e..31d07c4c80 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance11Test.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance11Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java index ffb8fa1d9c..dd0b17dadd 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance2Test.java @@ -14,9 +14,9 @@ package com.querydsl.apt.inheritance; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class Inheritance2Test { @QueryEntity diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java index a0f198ff17..8269e2d8d1 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance3Test.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance3Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java index 52253825ee..13fb51ca25 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance4Test.java @@ -18,7 +18,7 @@ import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.core.types.dsl.SimplePath; import com.querydsl.core.types.dsl.StringPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance4Test extends AbstractTest { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java index 7ff5ed29b6..123047c9c4 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance5Test.java @@ -20,7 +20,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.io.Serializable; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance5Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java index 2cf626cfca..060755ca0b 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance6Test.java @@ -21,7 +21,7 @@ import com.querydsl.core.types.dsl.NumberPath; import java.io.Serializable; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** Test multiple level superclasses with generics. */ public class Inheritance6Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java index 398f053df5..5ca8dcb42e 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance7Test.java @@ -17,8 +17,8 @@ import com.querydsl.core.annotations.QueryEntity; import java.util.Set; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class Inheritance7Test { @@ -64,7 +64,7 @@ public Set getChildren() { public static class SubCategory2 extends Category {} @Test - @Ignore + @Disabled public void parent() { // FIXME assertThat(QInheritance7Test_Category.category.parent.getType()).isEqualTo(Category.class); @@ -75,7 +75,7 @@ public void parent() { } @Test - @Ignore + @Disabled public void children() { // FIXME assertThat(QInheritance7Test_Category.category.children.getElementType()) diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java index 972ad5c9f0..9f5e577d47 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance8Test.java @@ -19,7 +19,7 @@ import com.querydsl.core.domain.CommonIdentifiable; import com.querydsl.core.domain.CommonPersistence; import com.querydsl.core.types.dsl.NumberPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance8Test { diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java index 04922821fb..cca5aae717 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/Inheritance9Test.java @@ -17,7 +17,7 @@ import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.domain.SuperSupertype; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * related to https://bugs.launchpad.net/querydsl/+bug/538148 diff --git a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java index 46f69d41c7..6a43993226 100644 --- a/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java +++ b/querydsl-tooling/querydsl-apt-test/src/test/java/com/querydsl/apt/inheritance/InheritanceTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.annotations.QueryEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InheritanceTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/NestedTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/NestedTest.java index 72e508e0c5..4e84ddab95 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/NestedTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/NestedTest.java @@ -2,7 +2,7 @@ import com.querydsl.codegen.utils.model.ClassType; import com.querydsl.codegen.utils.support.ClassUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NestedTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java index 1ea5a3fbcd..07bc71238b 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.io.StringWriter; import java.lang.annotation.ElementType; -import org.junit.Test; +import org.junit.jupiter.api.Test; @Annotation(prop2 = false, clazz = AnnotationTest.class) @Annotation2("Hello") @@ -54,7 +54,7 @@ public void ClassAnnotation3() throws IOException { @Test public void MethodAnnotation() throws IOException, SecurityException, NoSuchMethodException { writer.annotation(getClass().getMethod("MethodAnnotation").getAnnotation(Test.class)); - assertThat(w.toString().trim()).isEqualTo("@org.junit.Test"); + assertThat(w.toString().trim()).isEqualTo("@org.junit.jupiter.api.Test"); } @Test diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java index 8840555384..bf5d727a29 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java @@ -6,6 +6,7 @@ package com.querydsl.codegen.utils; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.querydsl.codegen.utils.model.ClassType; import com.querydsl.codegen.utils.model.Type; @@ -15,7 +16,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ComplexEvaluationTest { @@ -106,7 +107,7 @@ public void ComplexClassLoading() { } } - @Test(expected = CodegenException.class) + @Test @SuppressWarnings("unchecked") public void ComplexClassLoadingFailure() { var resultType = new ClassType(TypeCategory.LIST, List.class, Types.STRING); @@ -125,20 +126,24 @@ public void ComplexClassLoadingFailure() { source.append("}\n"); source.append("return rv;"); - @SuppressWarnings("rawtypes") // cannot specify further than List.class - Evaluator evaluator = - factory.createEvaluator( - source.toString(), - resultType, - new String[] {"a_", "b_"}, - new Type[] {resultType, resultType}, - new Class[] {List.class, List.class}, - Collections.emptyMap()); + assertThatThrownBy( + () -> { + @SuppressWarnings("rawtypes") // cannot specify further than List.class + Evaluator evaluator = + factory.createEvaluator( + source.toString(), + resultType, + new String[] {"a_", "b_"}, + new Type[] {resultType, resultType}, + new Class[] {List.class, List.class}, + Collections.emptyMap()); - List a = Arrays.asList("1", "2", "3", "4"); - List b = Arrays.asList("2", "4", "6", "8"); + List a = Arrays.asList("1", "2", "3", "4"); + List b = Arrays.asList("2", "4", "6", "8"); - assertThat(evaluator.evaluate(a, b)).isEqualTo(Arrays.asList("2", "4")); + assertThat(evaluator.evaluate(a, b)).isEqualTo(Arrays.asList("2", "4")); + }) + .isInstanceOf(CodegenException.class); } @Test diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java index 900236c843..5f0fbf7eaf 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ECJEvaluatorFactoryTest.java @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ECJEvaluatorFactoryTest { @@ -41,7 +41,7 @@ public String getName() { private List> string_int = Arrays.>asList(String.class, int.class); - @Before + @BeforeEach public void setUp() throws IOException { factory = new ECJEvaluatorFactory(getClass().getClassLoader()); } diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java index b891d308a6..d641d4caba 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/InnerClassesTest.java @@ -7,7 +7,7 @@ import com.querydsl.codegen.utils.model.Type; import java.io.IOException; import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InnerClassesTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java index 8c45bacfcb..5157e46399 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JDKEvaluatorFactoryTest.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JDKEvaluatorFactoryTest { @@ -42,7 +42,7 @@ public String getName() { private List> string_int = Arrays.>asList(String.class, int.class); - @Before + @BeforeEach public void setUp() throws IOException { factory = new JDKEvaluatorFactory(getClass().getClassLoader()); } diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java index 351dcab87f..1245732f42 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/JavaWriterTest.java @@ -24,8 +24,8 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class JavaWriterTest { @@ -59,7 +59,7 @@ private static void match(String resource, String text) throws IOException { assertThat(actual).isEqualTo(expected); } - @Before + @BeforeEach public void setUp() { w = new StringWriter(); writer = new JavaWriter(w); @@ -198,18 +198,6 @@ public void Annotations2() throws IOException { writer.beginClass(testType); writer.annotation( new Test() { - @Override - public Class expected() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long timeout() { - - return 0; - } - @Override public Class annotationType() { return Test.class; diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java index 4318a0897b..2c8a77a9d3 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemJavaFileObjectTest.java @@ -9,7 +9,7 @@ import java.io.IOException; import javax.tools.JavaFileObject.Kind; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MemJavaFileObjectTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java index 075e95aa08..618394b37c 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/MemSourceFileObjectTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MemSourceFileObjectTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java index 3b55b69520..168b30cd78 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ScalaWriterTest.java @@ -18,8 +18,8 @@ import java.util.Arrays; import java.util.List; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ScalaWriterTest { @@ -37,7 +37,7 @@ public Parameter apply(Parameter input) { private Type testType, testType2, testSuperType, testInterface1, testInterface2; - @Before + @BeforeEach public void setUp() { testType = new ClassType(JavaWriterTest.class); testType2 = @@ -282,18 +282,6 @@ public void Annotations2() throws IOException { writer.beginClass(testType); writer.annotation( new Test() { - @Override - public Class expected() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long timeout() { - - return 0; - } - @Override public Class annotationType() { return Test.class; diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java index 2691477bc1..e95d749275 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.java @@ -17,19 +17,19 @@ import java.util.List; import javax.tools.JavaCompiler; import javax.tools.ToolProvider; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class SimpleCompilerTest { - @After + @AfterEach public void tearDown() { new File("src/test/java/com/querydsl/codegen/utils/SimpleCompilerTest.class").delete(); } @Test - @Ignore + @Disabled public void Run() throws UnsupportedEncodingException { new File("target/out").mkdir(); var compiler = ToolProvider.getSystemJavaCompiler(); diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java index 4f56dfd007..8c29401f37 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/SurefireBooterTest.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.net.URLClassLoader; import java.util.jar.Manifest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SurefireBooterTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java index 1bca60c72e..9c89f48a00 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ClassTypeTest.java @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClassTypeTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java index 0562a03894..6647b038a4 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ConstructorTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConstructorTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java index 9d5977877b..f889583626 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/ParameterTest.java @@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ParameterTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java index 0b7b45084d..a6f847cb18 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/SimpleTypeTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SimpleTypeTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java index caaaff627e..92725b4729 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeAdapterTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeAdapterTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java index e689a6b738..209b56e75b 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeCategoryTest.java @@ -9,7 +9,7 @@ import java.sql.Date; import java.sql.Time; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeCategoryTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java index 5fad00f28a..03e573f7b5 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeExtendsTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeExtendsTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java index 8383f812d9..11be1ed2fd 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeSuperTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeSuperTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java index a62dc91ac8..0c83a7ca72 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/model/TypeTest.java @@ -12,7 +12,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java index cc68036e19..8f3704ee0e 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/support/ClassUtilsTest.java @@ -15,7 +15,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClassUtilsTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations index 40e5682067..c5c8051e94 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations @@ -6,7 +6,7 @@ import java.io.StringWriter; @Entity public class JavaWriterTest { - @org.junit.Test + @org.junit.jupiter.api.Test public void test() { } diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations2 b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations2 index 2082dd3fe9..82fc6b8b21 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations2 +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testAnnotations2 @@ -6,7 +6,7 @@ import java.io.*; @Entity public class JavaWriterTest { - @org.junit.Test + @org.junit.jupiter.api.Test public void test() { } diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testBasic b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testBasic index 9f9656a21f..5bda51e644 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testBasic +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testBasic @@ -2,7 +2,7 @@ package com.querydsl.codegen.utils; import java.io.IOException; import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JavaWriterTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testInterface b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testInterface index ecb168c5aa..a33e89a3ac 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testInterface +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testInterface @@ -2,7 +2,7 @@ package com.querydsl.codegen.utils; import java.io.IOException; import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public interface JavaWriterTest { diff --git a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testJavadoc b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testJavadoc index 684cdaa51d..55d9568229 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testJavadoc +++ b/querydsl-tooling/querydsl-codegen-utils/src/test/resources/testJavadoc @@ -2,7 +2,7 @@ package com.querydsl.codegen.utils; import java.io.IOException; import java.io.StringWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * JavaWriterTest is a test class diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java index 2666c9361d..ed8b3b5094 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/AbstractExporterTest.java @@ -1,7 +1,7 @@ package com.querydsl.codegen; import java.io.File; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class AbstractExporterTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java index de3d78044e..8d94630710 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/BeanSerializerTest.java @@ -29,8 +29,8 @@ import java.io.Writer; import java.util.Arrays; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class BeanSerializerTest { @@ -40,7 +40,7 @@ public class BeanSerializerTest { private final Writer writer = new StringWriter(); - @Before + @BeforeEach public void setUp() { typeModel = new SimpleType( diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java index 1a50080dd2..a95c152add 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ClassPathUtilsTest.java @@ -17,7 +17,7 @@ import com.SomeClass; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ClassPathUtilsTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java index 06f627b4bf..b4601acb30 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CodegenModuleTest.java @@ -14,9 +14,10 @@ package com.querydsl.codegen; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.lang.annotation.Annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CodegenModuleTest { @@ -32,9 +33,10 @@ public void typeMappings() { assertThat(module.get(TypeMappings.class)).isNotNull(); } - @Test(expected = IllegalArgumentException.class) + @Test public void get_with_unknown_key() { - module.get(String.class, "XXX"); + assertThatThrownBy(() -> module.get(String.class, "XXX")) + .isInstanceOf(IllegalArgumentException.class); } @Test diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java index 9f416fa560..697fda863f 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/CustomTypeTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CustomTypeTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java index 924ff2f439..d0c24746d6 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/DelegateTest.java @@ -18,7 +18,7 @@ import com.querydsl.codegen.utils.model.Parameter; import com.querydsl.codegen.utils.model.Types; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DelegateTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java index 875b0a390a..b460bee1c4 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.EnumMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EmbeddableSerializerTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java index 89d179b1f6..035041756f 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java @@ -29,7 +29,7 @@ import java.util.Date; import java.util.EnumMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EntitySerializerTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java index e30b639de3..be9c73150a 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/EntityTypeTest.java @@ -18,7 +18,7 @@ import com.querydsl.codegen.utils.model.ClassType; import com.querydsl.codegen.utils.model.TypeCategory; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EntityTypeTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java index 539c611417..2a6c30c7bc 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ExternalEmbeddableTest.java @@ -3,9 +3,9 @@ import com.querydsl.core.annotations.QueryEmbedded; import com.querydsl.core.annotations.QueryEntity; import com.querydsl.core.domain.EmbeddableWithoutQType; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; -@Ignore +@Disabled public class ExternalEmbeddableTest { @QueryEntity diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java index 6270451100..4d6519faad 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GeneratedAnnotationResolverTest.java @@ -4,7 +4,7 @@ import jakarta.annotation.Generated; import java.lang.annotation.Annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GeneratedAnnotationResolverTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java index 6e079b24fc..fdb687c350 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Generic2Test.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Generic2Test { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java index 53d07d22ee..43fd5da725 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericExporterTest.java @@ -18,157 +18,135 @@ import com.querydsl.core.domain.Cat; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class GenericExporterTest { - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; private GenericExporter exporter; - @Before + @BeforeEach public void setUp() { exporter = new GenericExporter(); } @Test public void export() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/sub/QExampleEntity2.java")).exists(); } @Test public void export_with_keywords() throws IOException { exporter.setKeywords(Keywords.JPA); - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.export(getClass().getPackage()); - var str = - new String( - Files.readAllBytes( - new File(folder.getRoot(), "com/querydsl/codegen/QGroup.java").toPath()), - StandardCharsets.UTF_8); + var str = Files.readString(new File(folder, "com/querydsl/codegen/QGroup.java").toPath()); assertThat(str).contains("QGroup group = new QGroup(\"group1\");"); } @Test public void export_with_stopClass() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.addStopClass(Examples.Supertype.class); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExamples_Supertype.java").exists()) + assertThat(new File(folder, "com/querydsl/codegen/QExamples_Supertype.java").exists()) .isFalse(); } @Test public void override_serializer() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.setSerializerClass(DefaultEntitySerializer.class); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/sub/QExampleEntity2.java")).exists(); } @Test public void export_package_as_string() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.export(getClass().getPackage().getName()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/sub/QExampleEntity2.java")).exists(); } @Test public void export_with_package_suffix() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.setPackageSuffix("types"); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEmbeddable.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEmbedded.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEntity.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegentypes/QExampleSupertype.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/subtypes/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegentypes/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegentypes/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegentypes/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegentypes/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegentypes/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/subtypes/QExampleEntity2.java")).exists(); } @Test public void export_handle_no_methods_nor_fields() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.setHandleFields(false); exporter.setHandleMethods(false); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); } @Test public void export_domain_package() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.export(Cat.class.getPackage()); } @Test public void export_serializerConfig() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.setSerializerConfig(new SimpleSerializerConfig(true, true, true, true, "")); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/sub/QExampleEntity2.java")).exists(); } @Test public void export_useFieldTypes() { - exporter.setTargetFolder(folder.getRoot()); + exporter.setTargetFolder(folder); exporter.setUseFieldTypes(true); exporter.export(getClass().getPackage()); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEmbedded.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntity.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleEntityInterface.java")) - .exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/QExampleSupertype.java")).exists(); - assertThat(new File(folder.getRoot(), "com/querydsl/codegen/sub/QExampleEntity2.java")) - .exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbeddable.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEmbedded.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntity.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleEntityInterface.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/QExampleSupertype.java")).exists(); + assertThat(new File(folder, "com/querydsl/codegen/sub/QExampleEntity2.java")).exists(); } @Test public void export_propertyHandling() throws IOException { for (PropertyHandling ph : PropertyHandling.values()) { - var f = folder.newFolder(); + var f = Files.createTempDirectory(folder.toPath(), "export").toFile(); var e = new GenericExporter(); e.setTargetFolder(f); e.setPropertyHandling(ph); diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java index f97ff8f11d..709bf6d52b 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GenericTest.java @@ -1,7 +1,7 @@ package com.querydsl.codegen; import com.querydsl.codegen.utils.model.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java index f48f428c9f..e25ad19958 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/GroovyBeanSerializerTest.java @@ -27,8 +27,8 @@ import java.io.Writer; import java.util.Arrays; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class GroovyBeanSerializerTest { @@ -38,7 +38,7 @@ public class GroovyBeanSerializerTest { private final Writer writer = new StringWriter(); - @Before + @BeforeEach public void setUp() { typeModel = new SimpleType( diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java index c3afe62b2b..2b4219897d 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/Inheritance2Test.java @@ -5,7 +5,7 @@ import com.querydsl.codegen.utils.model.TypeExtends; import com.querydsl.core.annotations.QueryEntity; import java.io.File; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Inheritance2Test { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java index bbcdd1f926..108327d8df 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PackageSuffixTest.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PackageSuffixTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java index 6261cd8681..ede6587d7d 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java @@ -27,7 +27,7 @@ import java.io.StringWriter; import java.io.Writer; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProjectionSerializerTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java index 065bf464cd..e2d116965c 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/PropertyTest.java @@ -19,7 +19,7 @@ import com.querydsl.codegen.utils.model.Type; import com.querydsl.codegen.utils.model.TypeCategory; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PropertyTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java index 756148e148..192c2d0a20 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/QueryTypeFactoryTest.java @@ -17,7 +17,7 @@ import com.querydsl.codegen.utils.model.ClassType; import com.querydsl.codegen.utils.model.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class QueryTypeFactoryTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java index 4fbee1a3f6..269d2b291f 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/ScalaTypeDump.java @@ -33,13 +33,13 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ScalaTypeDump { @Test - @Ignore + @Disabled public void test() throws IOException { List> classes = new ArrayList<>(); classes.add(SimpleExpression.class); diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java index ba7f361e53..bb2696ec9e 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/SerializerTest.java @@ -32,8 +32,8 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SerializerTest { @@ -44,7 +44,7 @@ public class SerializerTest { private TypeMappings typeMappings = new JavaTypeMappings(); @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { // type Type typeModel = diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java index f720777f5e..b0534294e5 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeFactoryTest.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeFactoryTest { diff --git a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java index 3867e31ad3..f56b3c62d4 100644 --- a/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java +++ b/querydsl-tooling/querydsl-codegen/src/test/java/com/querydsl/codegen/TypeMappingsTest.java @@ -20,7 +20,7 @@ import com.querydsl.codegen.utils.model.Type; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TypeMappingsTest { diff --git a/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java b/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java index a7f03e3c5d..ca8b912c67 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java +++ b/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java @@ -18,26 +18,22 @@ import jakarta.persistence.Persistence; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collection; import java.util.Comparator; import java.util.Properties; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ErrorCollector; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import java.util.stream.Stream; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.TestFactory; -@RunWith(Parameterized.class) public class JPADomainExporterTest { - @Rule public ErrorCollector errors = new ErrorCollector(); + private final File origRoot = + new File( + "../../querydsl-libraries/querydsl-jpa/target/generated-test-sources/test-annotations"); - @Parameters - public static Collection generateFiles() throws Exception { + @TestFactory + public Stream generatedFilesMatchReference() throws Exception { var emf = Persistence.createEntityManagerFactory("h2", new Properties()); var outputFolder = Files.createTempDirectory("jpa-exporter-test"); var exporter = new JPADomainExporter(outputFolder.toFile(), emf.getMetamodel()); @@ -48,27 +44,16 @@ public static Collection generateFiles() throws Exception { return files.stream() .sorted(Comparator.comparing(File::getName)) - .map(file -> new Object[] {outputFolder, file}) - .toList(); - } - - private File file; - private Path outputFolder; - private File origRoot = - new File( - "../../querydsl-libraries/querydsl-jpa/target/generated-test-sources/test-annotations"); - - public JPADomainExporterTest(Path outputFolder, File file) { - this.file = file; - this.outputFolder = outputFolder; + .map( + file -> + DynamicTest.dynamicTest(file.getName(), () -> assertMatches(outputFolder, file))); } - @Test - public void test() throws IOException { + private void assertMatches(Path outputFolder, File file) throws IOException { var relativeFile = outputFolder.relativize(file.toPath()); var origFile = origRoot.toPath().resolve(relativeFile); - var reference = new String(Files.readAllBytes(origFile), StandardCharsets.UTF_8); - var content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); + var reference = Files.readString(origFile); + var content = Files.readString(file.toPath()); if (file.getName().equals("QCalendar.java")) { // The APT processor does not apply @Temporal(TemporalType.DATE) to @ElementCollection diff --git a/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java b/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java index 4fbbc55786..d24b119d14 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java +++ b/querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java @@ -4,22 +4,20 @@ import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class AntJPADomainExporterTest { - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; @Test public void test() throws IOException { var exporter = new AntJPADomainExporter(); exporter.setNamePrefix("Q"); exporter.setNameSuffix(""); - var outputFolder = folder.getRoot().toPath(); + var outputFolder = folder.toPath(); exporter.setTargetFolder(outputFolder.toFile().getAbsolutePath()); exporter.setPersistenceUnitName("h2"); exporter.execute(); @@ -32,9 +30,8 @@ public void test() throws IOException { for (File file : files) { var relativeFile = outputFolder.relativize(file.toPath()); var origFile = origRoot.toPath().resolve(relativeFile); - var reference = - new String(java.nio.file.Files.readAllBytes(origFile), StandardCharsets.UTF_8); - var content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); + var reference = Files.readString(origFile); + var content = Files.readString(file.toPath()); if (file.getName().equals("QCalendar.java")) { // The APT processor does not apply @Temporal(TemporalType.DATE) to @ElementCollection diff --git a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt index e68cbcfeb9..3843ddcbcf 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt +++ b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt @@ -31,9 +31,8 @@ import com.querydsl.codegen.utils.model.Types import com.querydsl.core.annotations.Generated import com.querydsl.core.annotations.PropertyType import com.querydsl.kotlin.codegen.CompileUtils.assertCompiles -import org.junit.Assert -import org.junit.Ignore -import org.junit.Test +import org.junit.jupiter.api.Disabled +import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions import org.assertj.core.api.Assertions.assertThat @@ -164,7 +163,7 @@ class EmbeddableSerializerTest { } @Test - @Ignore + @Disabled fun delegates() { val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false) val entityType = EntityType(type) diff --git a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt index 8e686ba1d3..4bc961032d 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt +++ b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt @@ -31,9 +31,8 @@ import com.querydsl.codegen.utils.model.Types import com.querydsl.core.annotations.Generated import com.querydsl.core.annotations.PropertyType import com.querydsl.kotlin.codegen.CompileUtils.assertCompiles -import org.junit.Assert -import org.junit.Ignore -import org.junit.Test +import org.junit.jupiter.api.Disabled +import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions import java.io.StringWriter @@ -174,7 +173,7 @@ class EntitySerializerTest { @Test - @Ignore //TODO: Implement delegates. Or document that extensions need to be used instead? + @Disabled //TODO: Implement delegates. Or document that extensions need to be used instead? fun delegates() { val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false) val entityType = EntityType(type) diff --git a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt index 7a9b2522f4..1436010538 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt +++ b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt @@ -26,8 +26,7 @@ import com.querydsl.codegen.utils.model.TypeCategory import com.querydsl.codegen.utils.model.Types import com.querydsl.core.annotations.Generated import org.assertj.core.api.Assertions.assertThat -import org.junit.Assert -import org.junit.Test +import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions import java.io.StringWriter diff --git a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt index 40f1fe0454..1f14378a54 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt +++ b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt @@ -6,7 +6,8 @@ import com.tschuchort.compiletesting.configureKsp import com.tschuchort.compiletesting.kspSourcesDir import org.assertj.core.api.Assertions.assertThat import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi -import org.junit.Test +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.Timeout import java.io.File import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.CountDownLatch @@ -296,7 +297,8 @@ class KspProcessorIntegrationTest { .doesNotContain("SimplePath") } - @Test(timeout = 30_000) + @Test + @Timeout(30) fun bidirectionalEntities_loadConcurrentlyWithoutDeadlock() { // Regression: two JPA entities with mutual @ManyToOne refs (Foo has // a Bar, Bar has a Foo) are the canonical case where APT-generated diff --git a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/RenderTest.kt b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/RenderTest.kt index 364ddb6e7b..79d17fd493 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/RenderTest.kt +++ b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/RenderTest.kt @@ -9,7 +9,8 @@ import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.asClassName import io.mockk.mockk import org.assertj.core.api.Assertions.assertThat -import org.junit.Test +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.Timeout import javax.script.ScriptEngineManager class RenderTest { diff --git a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java index 59ae216a28..3b991d2833 100644 --- a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java +++ b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/CompileMojoTest.java @@ -2,7 +2,7 @@ import java.io.File; import org.apache.maven.project.MavenProject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.sonatype.plexus.build.incremental.DefaultBuildContext; public class CompileMojoTest { diff --git a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java index 80794b1fac..ca80150b19 100644 --- a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java +++ b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/GenericExporterMojoTest.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GenericExporterMojoTest { diff --git a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java index 1285826ca9..03261af33d 100644 --- a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java +++ b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/JPAExporterMojoTest.java @@ -4,7 +4,7 @@ import java.io.File; import org.apache.maven.project.MavenProject; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JPAExporterMojoTest { diff --git a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java index 6e22428a7c..b54955efbf 100644 --- a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java +++ b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/MetadataExportMojoTest.java @@ -28,11 +28,10 @@ import java.io.Serializable; import java.util.Collections; import org.apache.maven.project.MavenProject; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInfo; public class MetadataExportMojoTest { @@ -50,10 +49,11 @@ public class MetadataExportMojoTest { private final MetadataExportMojo mojo = new MetadataExportMojo(); - @Rule public TestName testName = new TestName(); + private String testName; - @Before - public void setUp() { + @BeforeEach + public void setUp(TestInfo testInfo) { + testName = testInfo.getTestMethod().orElseThrow().getName(); mojo.setProject(project); mojo.setJdbcDriver("org.h2.Driver"); mojo.setJdbcUrl(url); @@ -149,7 +149,7 @@ public void executeWithBeans() throws Exception { } @Test - @Ignore + @Disabled public void executeWithScalaSources() throws Exception { mojo.setTargetFolder("target/export7"); mojo.setCreateScalaSources(true); @@ -226,7 +226,7 @@ public void executeWithRenames() throws Exception { @Test public void executeWithUnsetSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern(null); @@ -239,7 +239,7 @@ public void executeWithUnsetSchemaPattern() throws Exception { @Test public void executeWithExactSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1"); @@ -253,7 +253,7 @@ public void executeWithExactSchemaPattern() throws Exception { @Test public void executeWithSimilarSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("%EMA1"); @@ -267,7 +267,7 @@ public void executeWithSimilarSchemaPattern() throws Exception { @Test public void executeWithMismatchedSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("NON_EXISTENT_SCHEMA"); @@ -280,7 +280,7 @@ public void executeWithMismatchedSchemaPattern() throws Exception { @Test public void executeWithMultipleSchemaPatterns() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,SCHEMA2"); @@ -298,7 +298,7 @@ public void executeWithMultipleSchemaPatterns() throws Exception { @Test public void executeWithEmptySchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern(""); @@ -312,7 +312,7 @@ public void executeWithEmptySchemaPattern() throws Exception { @Test public void executeWithMultipleSchemaPatternsAndInterleavedEmpty() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,,SCHEMA2"); @@ -325,7 +325,7 @@ public void executeWithMultipleSchemaPatternsAndInterleavedEmpty() throws Except @Test public void executeWithMultipleSchemaPatternsAndLeadingEmpty() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern(",SCHEMA2"); @@ -338,9 +338,9 @@ public void executeWithMultipleSchemaPatternsAndLeadingEmpty() throws Exception } @Test - @Ignore("Trailing empty strings are not handled correctly by the MetaDataExporter") + @Disabled("Trailing empty strings are not handled correctly by the MetaDataExporter") public void executeWithMultipleSchemaPatternsAndTrailingEmpty() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,"); @@ -358,7 +358,7 @@ public void executeWithMultipleSchemaPatternsAndTrailingEmpty() throws Exception @Test public void executeWithBlankUppercaseSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("BLANK"); @@ -372,7 +372,7 @@ public void executeWithBlankUppercaseSchemaPattern() throws Exception { @Test public void executeWithBlankLowercaseSchemaPattern() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("blank"); @@ -386,7 +386,7 @@ public void executeWithBlankLowercaseSchemaPattern() throws Exception { @Test public void executeWithSchemaPatternContainingBlank() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1BLANK"); @@ -399,7 +399,7 @@ public void executeWithSchemaPatternContainingBlank() throws Exception { @Test public void executeWithMultipleSchemaPatternsAndInterleavedBlank() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,BLANK,SCHEMA2"); @@ -412,7 +412,7 @@ public void executeWithMultipleSchemaPatternsAndInterleavedBlank() throws Except @Test public void executeWithMultipleSchemaPatternsAndLeadingBlank() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("BLANK,SCHEMA2"); @@ -425,9 +425,9 @@ public void executeWithMultipleSchemaPatternsAndLeadingBlank() throws Exception } @Test - @Ignore("Trailing empty strings are not handled correctly by the MetaDataExporter") + @Disabled("Trailing empty strings are not handled correctly by the MetaDataExporter") public void executeWithMultipleSchemaPatternsAndTrailingBlank() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,BLANK"); @@ -441,7 +441,7 @@ public void executeWithMultipleSchemaPatternsAndTrailingBlank() throws Exception @Test public void executeWithMultipleSchemaPatternsAndContainingBlank() throws Exception { - var targetFolder = "target/" + testName.getMethodName(); + var targetFolder = "target/" + testName; mojo.setTargetFolder(targetFolder); mojo.setSchemaPattern("SCHEMA1,SCHEMA2BLANK"); diff --git a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java index 5a845baa51..58d1be7268 100644 --- a/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java +++ b/querydsl-tooling/querydsl-maven-plugin/src/test/java/com/querydsl/maven/TestMetadataExportMojoTest.java @@ -21,7 +21,7 @@ import java.util.Collections; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestMetadataExportMojoTest { diff --git a/querydsl-tooling/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java b/querydsl-tooling/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java index 986b4b0ec2..02317abec4 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataExporter.java @@ -413,9 +413,13 @@ private void handleColumn(EntityType classModel, String tableName, ResultSet col var typeName = columns.getString("TYPE_NAME"); var columnSize = (Number) columns.getObject("COLUMN_SIZE"); var columnDigits = (Number) columns.getObject("DECIMAL_DIGITS"); - var columnIndex = columns.getInt("ORDINAL_POSITION"); + // Read the columns in ascending column-index order. In Oracle the COLUMN_DEF (index 13) value + // is exposed as a streamed LONG, and the driver closes that stream once a higher-indexed column + // (e.g. ORDINAL_POSITION, index 17) is read first, causing "ORA-17027: Stream has already been + // closed." on tables whose columns have default values. var nullable = columns.getInt("NULLABLE"); var columnDefaultValue = columns.getString("COLUMN_DEF"); + var columnIndex = columns.getInt("ORDINAL_POSITION"); var propertyName = namingStrategy.getPropertyName(normalizedColumnName, classModel); Class clazz = diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java index 61b95a0ace..1e15e90375 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java @@ -29,19 +29,18 @@ import com.querydsl.sql.types.UtilDateType; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.sql.SQLException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CustomTypesTest extends AbstractJDBCTest { private Configuration configuration; @Override - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { super.setUp(); // create schema @@ -83,7 +82,7 @@ public void export() throws SQLException, IOException { exporter.export(connection.getMetaData()); var qpersonFile = Path.of("target", "customExport", "test", "QPerson.java"); assertThat(qpersonFile).exists(); - var person = new String(Files.readAllBytes(qpersonFile), StandardCharsets.UTF_8); + var person = Files.readString(qpersonFile); // System.err.println(person); assertThat(person).contains("createEnum(\"gender\""); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java index cd3bf4a170..6118e69d18 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/DefaultNamingStrategyTest.java @@ -18,8 +18,8 @@ import com.querydsl.codegen.EntityType; import com.querydsl.codegen.Property; import com.querydsl.codegen.utils.model.Types; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DefaultNamingStrategyTest { @@ -27,7 +27,7 @@ public class DefaultNamingStrategyTest { private EntityType entityModel; - @Before + @BeforeEach public void setUp() { entityModel = new EntityType(Types.OBJECT); // entityModel.addAnnotation(new TableImpl("OBJECT")); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java index 4f5c8b3106..65837fe7f6 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportBaseTest.java @@ -16,15 +16,15 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.sql.Connections; +import java.io.File; import java.sql.SQLException; -import org.junit.AfterClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public abstract class ExportBaseTest { - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; @Test public void export() throws SQLException { @@ -32,20 +32,20 @@ public void export() throws SQLException { // config.setSpatial(true); config.setSchemaPattern(getSchemaPattern()); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setNamingStrategyClass(DefaultNamingStrategy.class); var exporter = new MetaDataExporter(config); exporter.export(Connections.getConnection().getMetaData()); - assertThat(folder.getRoot().listFiles().length).isGreaterThan(0); + assertThat(folder.listFiles().length).isGreaterThan(0); } protected String getSchemaPattern() { return null; } - @AfterClass + @AfterAll public static void tearDownAfterClass() throws SQLException { Connections.close(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java index 2b14accea9..5230e72c40 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportDerbyTest.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.Derby; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(Derby.class) +@Tag("com.querydsl.core.testutil.Derby") public class ExportDerbyTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initDerby(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java index 3d3c18b4e3..32340e8920 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2Test.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class ExportH2Test extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initH2(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java index 830cadde7c..2fa7413c33 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportH2TwoSchemasTest.java @@ -2,27 +2,24 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.querydsl.core.testutil.H2; import com.querydsl.sql.Connections; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.sql.SQLException; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; -@Category(H2.class) +@Tag("com.querydsl.core.testutil.H2") public class ExportH2TwoSchemasTest { - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initH2(); @@ -35,7 +32,7 @@ public static void setUpClass() throws Exception { """); } - @AfterClass + @AfterAll public static void tearDownAfterClass() throws SQLException { Connections.close(); } @@ -45,15 +42,12 @@ public void export() throws SQLException, MalformedURLException, IOException { var config = new MetadataExporterConfigImpl(); config.setSchemaPattern(null); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(Connections.getConnection().getMetaData()); - var contents = - new String( - Files.readAllBytes(new File(folder.getRoot(), "test/QSurvey.java").toPath()), - StandardCharsets.UTF_8); + var contents = Files.readString(new File(folder, "test/QSurvey.java").toPath()); assertThat(contents).contains("id"); assertThat(contents).contains("name"); assertThat(contents).contains("name2"); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java index 91e0c01a14..c65fa06fdf 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportHsqldbTest.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.HSQLDB; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(HSQLDB.class) +@Tag("com.querydsl.core.testutil.HSQLDB") public class ExportHsqldbTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initHSQL(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java index e87591d32b..43740d810a 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMSSQLTest.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.SQLServer; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(SQLServer.class) +@Tag("com.querydsl.core.testutil.SQLServer") public class ExportMSSQLTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initSQLServer(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java index c34ee3616f..803d609a66 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportMySQLTest.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.MySQL; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(MySQL.class) +@Tag("com.querydsl.core.testutil.MySQL") public class ExportMySQLTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initMySQL(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java index 418932edbe..579ac082d3 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportOracleTest.java @@ -13,16 +13,15 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.Oracle; import com.querydsl.sql.Connections; import java.util.TimeZone; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(Oracle.class) +@Tag("com.querydsl.core.testutil.Oracle") public class ExportOracleTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { var tz = TimeZone.getDefault(); try { diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java index 04986c738f..d76baccd54 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportPostgreSQLTest.java @@ -13,15 +13,14 @@ */ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.PostgreSQL; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(PostgreSQL.class) +@Tag("com.querydsl.core.testutil.PostgreSQL") public class ExportPostgreSQLTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initPostgreSQL(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java index 4c40738135..1de886deee 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportSQLiteTest.java @@ -1,14 +1,13 @@ package com.querydsl.sql.codegen; -import com.querydsl.core.testutil.SQLite; import com.querydsl.sql.Connections; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; -@Category(SQLite.class) +@Tag("com.querydsl.core.testutil.SQLite") public class ExportSQLiteTest extends ExportBaseTest { - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { Connections.initSQLite(); } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java index b7637b22b0..2429126fb5 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedBeanSerializerTest.java @@ -22,10 +22,9 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class ExtendedBeanSerializerTest { @@ -34,18 +33,21 @@ public class ExtendedBeanSerializerTest { private static final String PACKAGE = String.join(".", PATH); private static final String FULL_NAME = PACKAGE + "." + CLASS_NAME; - @Rule public TemporaryFolder compileFolder = new TemporaryFolder(); + @TempDir File compileFolder; private EntityType type; private File srcFile; - @Before + @BeforeEach public void setUp() throws IOException { Type typeModel = new SimpleType(TypeCategory.ENTITY, FULL_NAME, PACKAGE, CLASS_NAME, false, false); type = new EntityType(typeModel); - var srcFolder = compileFolder.newFolder(PATH); + var srcFolder = + java.nio.file.Files.createDirectories( + new File(compileFolder, String.join(File.separator, PATH)).toPath()) + .toFile(); srcFile = new File(srcFolder, CLASS_NAME + ".java"); } @@ -74,8 +76,7 @@ public void equals_hashcode_tostring() throws Exception { extendedBeanSerializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(fw)); fw.close(); - var classLoader = - URLClassLoader.newInstance(new URL[] {compileFolder.getRoot().toURI().toURL()}); + var classLoader = URLClassLoader.newInstance(new URL[] {compileFolder.toURI().toURL()}); var retCode = new SimpleCompiler().run(null, System.out, System.err, srcFile.getAbsolutePath()); assertThat(retCode).as("The generated source should compile").isEqualTo(0); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java index f12865a9aa..614b59f0d1 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExtendedNamingStrategyTest.java @@ -17,8 +17,8 @@ import com.querydsl.codegen.EntityType; import com.querydsl.codegen.utils.model.Types; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ExtendedNamingStrategyTest { @@ -26,7 +26,7 @@ public class ExtendedNamingStrategyTest { private EntityType entityModel; - @Before + @BeforeEach public void setUp() { entityModel = new EntityType(Types.OBJECT); // entityModel.addAnnotation(new TableImpl("OBJECT")); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java index bd20dc83fe..5f665124c6 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/KeyDataFactoryTest.java @@ -17,7 +17,7 @@ import com.querydsl.sql.AbstractJDBCTest; import java.sql.SQLException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeyDataFactoryTest extends AbstractJDBCTest { diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java index 00040b2c46..d6aaf2e938 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterAllTest.java @@ -1,12 +1,13 @@ package com.querydsl.sql.codegen; import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.DynamicTest.dynamicTest; import com.querydsl.codegen.BeanSerializer; import com.querydsl.codegen.utils.SimpleCompiler; -import com.querydsl.core.testutil.Parallelized; -import com.querydsl.core.testutil.SlowTest; +import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; @@ -15,34 +16,25 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Stream; import javax.tools.JavaCompiler; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -@RunWith(value = Parallelized.class) -@Category(SlowTest.class) +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.io.TempDir; + +@Tag("com.querydsl.core.testutil.SlowTest") public class MetaDataExporterAllTest { - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; private static Connection connection; private static DatabaseMetaData metadata; private static JavaCompiler compiler = new SimpleCompiler(); - private String namePrefix, nameSuffix, beanPrefix, beanSuffix; - private String beanPackageName; - private Class beanSerializer = BeanSerializer.class; - private Class namingStrategyClass; - private boolean withBeans, withInnerClasses, withOrdinalPositioning; - private boolean exportColumns, schemaToPackage; - - @BeforeClass + @BeforeAll public static void setUpClass() throws ClassNotFoundException, SQLException { Class.forName("org.h2.Driver"); var url = "jdbc:h2:mem:testdb" + System.currentTimeMillis() + ";MODE=legacy"; @@ -51,12 +43,11 @@ public static void setUpClass() throws ClassNotFoundException, SQLException { MetaDataExporterTest.createTables(connection); } - @AfterClass + @AfterAll public static void tearDownClass() throws SQLException { connection.close(); } - @Parameterized.Parameters public static List parameters() { List params = new ArrayList<>(); @@ -118,33 +109,27 @@ public static List parameters() { return params; } - public MetaDataExporterAllTest( - String namePrefix, - String nameSuffix, - String beanPrefix, - String beanSuffix, - String beanPackageName, - Class namingStrategy, - boolean withBeans, - boolean withInnerClasses, - boolean withOrdinalPositioning, - boolean exportColumns, - boolean schemaToPackage) { - this.namePrefix = namePrefix; - this.nameSuffix = nameSuffix; - this.beanPrefix = beanPrefix; - this.beanSuffix = beanSuffix; - this.beanPackageName = beanPackageName; - this.schemaToPackage = schemaToPackage; - this.namingStrategyClass = namingStrategy; - this.withBeans = withBeans; - this.withInnerClasses = withInnerClasses; - this.withOrdinalPositioning = withOrdinalPositioning; - this.exportColumns = exportColumns; + @TestFactory + public Stream export() { + return parameters().stream().map(p -> dynamicTest(Arrays.toString(p), () -> runExport(p))); } - @Test - public void export() throws SQLException, IOException { + @SuppressWarnings("unchecked") + private void runExport(Object[] p) throws SQLException, IOException { + var namePrefix = (String) p[0]; + var nameSuffix = (String) p[1]; + var beanPrefix = (String) p[2]; + var beanSuffix = (String) p[3]; + var beanPackageName = (String) p[4]; + var namingStrategyClass = (Class) p[5]; + var withBeans = (boolean) p[6]; + var withInnerClasses = (boolean) p[7]; + var withOrdinalPositioning = (boolean) p[8]; + var exportColumns = (boolean) p[9]; + var schemaToPackage = (boolean) p[10]; + + var targetFolder = Files.createTempDirectory(folder.toPath(), "case").toFile(); + var config = new MetadataExporterConfigImpl(); config.setColumnAnnotations(exportColumns); config.setSchemaPattern("PUBLIC"); @@ -155,11 +140,11 @@ public void export() throws SQLException, IOException { config.setInnerClassesForKeys(withInnerClasses); config.setPackageName("test"); config.setBeanPackageName(beanPackageName); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(targetFolder); config.setNamingStrategyClass(namingStrategyClass); config.setSchemaToPackage(schemaToPackage); if (withBeans) { - config.setBeanSerializerClass(beanSerializer); + config.setBeanSerializerClass(BeanSerializer.class); } if (withOrdinalPositioning) { config.setColumnComparatorClass(OrdinalPositionComparator.class); @@ -172,7 +157,7 @@ public void export() throws SQLException, IOException { var compilationResult = compiler.run(null, System.out, System.err, classes.toArray(new String[0])); if (compilationResult != 0) { - fail("Compilation Failed for " + folder.getRoot().getPath()); + fail("Compilation Failed for " + targetFolder.getPath()); } } } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterColumnDefOrderingTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterColumnDefOrderingTest.java new file mode 100644 index 0000000000..2110601c09 --- /dev/null +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterColumnDefOrderingTest.java @@ -0,0 +1,126 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.sql.codegen; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + +import java.io.File; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.ArrayList; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** + * Regression test for the JDBC column-read ordering in {@link MetaDataExporter}. Oracle exposes + * {@code COLUMN_DEF} (index 13) as a streamed LONG and closes that stream as soon as a + * higher-indexed column such as {@code ORDINAL_POSITION} (index 17) is read first, which throws + * "ORA-17027: Stream has already been closed." on tables whose columns have default values. The + * exporter therefore must read {@code COLUMN_DEF} before {@code ORDINAL_POSITION}. + * + *

The Oracle JDBC driver streams LONG / LONG RAW columns and requires that they be read in + * SELECT-list order: the row is sent column by column and the stream of a LONG column is discarded + * once a later column is fetched. Because {@code DatabaseMetaData.getColumns(...)} backs {@code + * COLUMN_DEF} with such a LONG, the same ordering constraint applies to reading column metadata. + * See: + * + *

+ */ +public class MetaDataExporterColumnDefOrderingTest { + + @TempDir File folder; + + @Test + public void column_def_is_read_before_ordinal_position() throws SQLException { + var readOrder = new ArrayList(); + + ResultSet columns = createMock(ResultSet.class); + expect(columns.next()).andReturn(true).andReturn(false); + expect(columns.getString("COLUMN_NAME")).andReturn("NAME").anyTimes(); + expect(columns.getInt("DATA_TYPE")).andReturn(Types.VARCHAR).anyTimes(); + expect(columns.getString("TYPE_NAME")).andReturn("VARCHAR").anyTimes(); + expect(columns.getObject("COLUMN_SIZE")).andReturn(255).anyTimes(); + expect(columns.getObject("DECIMAL_DIGITS")).andReturn(null).anyTimes(); + expect(columns.getInt("NULLABLE")).andReturn(DatabaseMetaData.columnNullable).anyTimes(); + // Simulate Oracle's streamed-LONG behaviour: once ORDINAL_POSITION has been read the COLUMN_DEF + // stream is closed, so reading it afterwards fails. + expect(columns.getString("COLUMN_DEF")) + .andAnswer( + () -> { + if (readOrder.contains("ORDINAL_POSITION")) { + throw new SQLException("ORA-17027: Stream has already been closed."); + } + readOrder.add("COLUMN_DEF"); + return "'some default'"; + }) + .anyTimes(); + expect(columns.getInt("ORDINAL_POSITION")) + .andAnswer( + () -> { + readOrder.add("ORDINAL_POSITION"); + return 1; + }) + .anyTimes(); + columns.close(); + replay(columns); + + DatabaseMetaData metadata = createMock(DatabaseMetaData.class); + expect(metadata.getDatabaseProductName()).andReturn("Oracle").anyTimes(); + expect(metadata.getDatabaseMajorVersion()).andReturn(19).anyTimes(); + expect(metadata.getTables(anyObject(), anyObject(), anyObject(), anyObject())) + .andReturn(tableRow()); + expect(metadata.getColumns(anyObject(), anyObject(), anyObject(), anyObject())) + .andReturn(columns); + replay(metadata); + + var config = new MetadataExporterConfigImpl(); + config.setPackageName("test"); + config.setTargetFolder(folder); + // Keep the mock surface focused on column reading. + config.setExportPrimaryKeys(false); + config.setExportForeignKeys(false); + + var exporter = new MetaDataExporter(config); + // With the old ordering (ORDINAL_POSITION first) the COLUMN_DEF answer would raise ORA-17027 + // and export(...) would propagate the SQLException, failing this test. + exporter.export(metadata); + + assertThat(readOrder).containsExactly("COLUMN_DEF", "ORDINAL_POSITION"); + assertThat(new File(folder, "test/QFoo.java")).exists(); + } + + private ResultSet tableRow() throws SQLException { + ResultSet tables = createMock(ResultSet.class); + expect(tables.next()).andReturn(true).andReturn(false); + expect(tables.getString("TABLE_CAT")).andReturn(null).anyTimes(); + expect(tables.getString("TABLE_SCHEM")).andReturn("PUBLIC").anyTimes(); + expect(tables.getString("TABLE_NAME")).andReturn("FOO").anyTimes(); + tables.close(); + replay(tables); + return tables; + } +} diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java index 45e5f46dbb..8e389ad0e3 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataExporterTest.java @@ -14,6 +14,7 @@ package com.querydsl.sql.codegen; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.fail; import com.querydsl.codegen.BeanSerializer; @@ -32,12 +33,11 @@ import java.sql.DriverManager; import java.sql.SQLException; import javax.tools.JavaCompiler; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class MetaDataExporterTest { @@ -53,9 +53,9 @@ public class MetaDataExporterTest { private JavaCompiler compiler = new SimpleCompiler(); - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; - @BeforeClass + @BeforeAll public static void setUpClass() throws ClassNotFoundException, SQLException { Class.forName("org.h2.Driver"); var url = "jdbc:h2:mem:testdb" + System.currentTimeMillis() + ";MODE=legacy"; @@ -133,12 +133,12 @@ constraint product_bom foreign key (m_productbom_id) references product(id))\ } } - @AfterClass + @AfterAll public static void tearDownClass() throws SQLException { connection.close(); } - @Before + @BeforeEach public void setUp() throws ClassNotFoundException, SQLException { metadata = connection.getMetaData(); } @@ -147,14 +147,14 @@ public void setUp() throws ClassNotFoundException, SQLException { @Test public void normalSettings_repetition() throws SQLException { - test("Q", "", "", "", DefaultNamingStrategy.class, folder.getRoot(), false, false, false); + test("Q", "", "", "", DefaultNamingStrategy.class, folder, false, false, false); - var file = new File(folder.getRoot(), "test/QEmployee.java"); + var file = new File(folder, "test/QEmployee.java"); var lastModified = file.lastModified(); assertThat(file).exists(); clean = false; - test("Q", "", "", "", DefaultNamingStrategy.class, folder.getRoot(), false, false, false); + test("Q", "", "", "", DefaultNamingStrategy.class, folder, false, false, false); assertThat(file.lastModified()).isEqualTo(lastModified); } @@ -165,7 +165,7 @@ public void explicit_configuration() throws SQLException { config.setSchemaPattern("PUBLIC"); config.setNamePrefix("Q"); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setNamingStrategyClass(DefaultNamingStrategy.class); config.setBeanSerializerClass(BeanSerializer.class); config.setBeanPackageName("test2"); @@ -173,8 +173,8 @@ public void explicit_configuration() throws SQLException { var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/QDateTest.java")).exists(); - assertThat(new File(folder.getRoot(), "test2/DateTest.java")).exists(); + assertThat(new File(folder, "test/QDateTest.java")).exists(); + assertThat(new File(folder, "test2/DateTest.java")).exists(); } @Test @@ -193,15 +193,15 @@ name VARCHAR(255) NOT NULL DEFAULT 'some default')\ config.setNamePrefix("Q"); config.setPackageName("test"); config.setTableNamePattern("FOO"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setBeanSerializerClass(BeanSerializer.class); config.setValidationAnnotations(true); config.setExportBeans(true); var exporter = new MetaDataExporter(config); exporter.export(metadata); - var classLoader = URLClassLoader.newInstance(new URL[] {folder.getRoot().toURI().toURL()}); - compiler.run(null, null, null, folder.getRoot().getAbsoluteFile() + "/test/Foo.java"); + var classLoader = URLClassLoader.newInstance(new URL[] {folder.toURI().toURL()}); + compiler.run(null, null, null, folder.getAbsoluteFile() + "/test/Foo.java"); Class cls = Class.forName("test.Foo", true, classLoader); assertThat( ReflectionUtils.getAnnotatedElement(cls, "id", Integer.class) @@ -231,16 +231,16 @@ name VARCHAR(255) NOT NULL)\ config.setNamePrefix("Q"); config.setPackageName("test"); config.setTableNamePattern("BAR"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setBeanSerializerClass(BeanSerializer.class); config.setValidationAnnotations(true); config.setExportBeans(true); var exporter = new MetaDataExporter(config); exporter.export(metadata); - var file = new File(folder.getRoot().getAbsoluteFile(), "/test/Bar.java"); + var file = new File(folder.getAbsoluteFile(), "/test/Bar.java"); assertThat(file.exists()); - var classLoader = URLClassLoader.newInstance(new URL[] {folder.getRoot().toURI().toURL()}); + var classLoader = URLClassLoader.newInstance(new URL[] {folder.toURI().toURL()}); compiler.run(null, null, null, file.toString()); Class cls = Class.forName("test.Bar", true, classLoader); assertThat( @@ -260,11 +260,11 @@ public void minimal_configuration() throws SQLException { var config = new MetadataExporterConfigImpl(); config.setSchemaPattern("PUBLIC"); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/QDateTest.java")).exists(); + assertThat(new File(folder, "test/QDateTest.java")).exists(); } @Test @@ -272,11 +272,11 @@ public void minimal_configuration_with_schemas() throws SQLException { var config = new MetadataExporterConfigImpl(); config.setSchemaPattern("PUBLIC2,PUBLIC"); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/QDateTest.java")).exists(); + assertThat(new File(folder, "test/QDateTest.java")).exists(); } @Test @@ -285,14 +285,14 @@ public void minimal_configuration_with_schemas_and_tables() throws SQLException config.setSchemaPattern("PUBLIC2,PUBLIC"); config.setTableNamePattern("RESERVED,UNDERSCORE,BEANGEN1"); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/QBeangen1.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QReserved.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QUnderscore.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QDefinstance.java").exists()).isFalse(); + assertThat(new File(folder, "test/QBeangen1.java")).exists(); + assertThat(new File(folder, "test/QReserved.java")).exists(); + assertThat(new File(folder, "test/QUnderscore.java")).exists(); + assertThat(new File(folder, "test/QDefinstance.java").exists()).isFalse(); } @Test @@ -301,30 +301,34 @@ public void minimal_configuration_with_tables() throws SQLException { config.setSchemaPattern("PUBLIC"); config.setTableNamePattern("RESERVED,UNDERSCORE,BEANGEN1"); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/QBeangen1.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QReserved.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QUnderscore.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QDefinstance.java").exists()).isFalse(); + assertThat(new File(folder, "test/QBeangen1.java")).exists(); + assertThat(new File(folder, "test/QReserved.java")).exists(); + assertThat(new File(folder, "test/QUnderscore.java")).exists(); + assertThat(new File(folder, "test/QDefinstance.java").exists()).isFalse(); } - @Test(expected = IllegalStateException.class) + @Test public void minimal_configuration_with_duplicate_tables() throws SQLException { - var config = new MetadataExporterConfigImpl(); - config.setSchemaPattern("PUBLIC"); - config.setTableNamePattern("%,%"); - config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); - var exporter = new MetaDataExporter(config); - exporter.export(metadata); - - assertThat(new File(folder.getRoot(), "test/QBeangen1.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QReserved.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QUnderscore.java")).exists(); - assertThat(new File(folder.getRoot(), "test/QDefinstance.java").exists()).isFalse(); + assertThatThrownBy( + () -> { + var config = new MetadataExporterConfigImpl(); + config.setSchemaPattern("PUBLIC"); + config.setTableNamePattern("%,%"); + config.setPackageName("test"); + config.setTargetFolder(folder); + var exporter = new MetaDataExporter(config); + exporter.export(metadata); + + assertThat(new File(folder, "test/QBeangen1.java")).exists(); + assertThat(new File(folder, "test/QReserved.java")).exists(); + assertThat(new File(folder, "test/QUnderscore.java")).exists(); + assertThat(new File(folder, "test/QDefinstance.java").exists()).isFalse(); + }) + .isInstanceOf(IllegalStateException.class); } @Test @@ -334,11 +338,11 @@ public void minimal_configuration_with_suffix() throws SQLException { config.setPackageName("test"); config.setNamePrefix(""); config.setNameSuffix("Type"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTestType.java")).exists(); + assertThat(new File(folder, "test/DateTestType.java")).exists(); } @Test @@ -348,12 +352,12 @@ public void minimal_configuration_without_keys() throws SQLException { config.setPackageName("test"); config.setNamePrefix(""); config.setNameSuffix("Type"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setExportForeignKeys(false); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTestType.java")).exists(); + assertThat(new File(folder, "test/DateTestType.java")).exists(); } @Test @@ -363,12 +367,12 @@ public void minimal_configuration_only_direct_foreign_keys() throws SQLException config.setPackageName("test"); config.setNamePrefix(""); config.setNameSuffix("Type"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setExportInverseForeignKeys(false); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTestType.java")).exists(); + assertThat(new File(folder, "test/DateTestType.java")).exists(); } @Test @@ -379,13 +383,13 @@ public void minimal_configuration_with_bean_prefix() throws SQLException { config.setNamePrefix(""); config.setBeanPrefix("Bean"); config.setBeanSerializerClass(BeanSerializer.class); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setExportBeans(true); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTest.java")).exists(); - assertThat(new File(folder.getRoot(), "test/BeanDateTest.java")).exists(); + assertThat(new File(folder, "test/DateTest.java")).exists(); + assertThat(new File(folder, "test/BeanDateTest.java")).exists(); } @Test @@ -396,13 +400,13 @@ public void minimal_configuration_with_bean_suffix() throws SQLException { config.setNamePrefix(""); config.setBeanSuffix("Bean"); config.setBeanSerializerClass(BeanSerializer.class); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setExportBeans(true); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTest.java")).exists(); - assertThat(new File(folder.getRoot(), "test/DateTestBean.java")).exists(); + assertThat(new File(folder, "test/DateTest.java")).exists(); + assertThat(new File(folder, "test/DateTestBean.java")).exists(); } @Test @@ -413,14 +417,15 @@ public void minimal_configuration_with_bean_folder() throws SQLException, IOExce config.setNamePrefix(""); config.setBeanSuffix("Bean"); config.setBeanSerializerClass(BeanSerializer.class); - config.setTargetFolder(folder.getRoot()); - config.setBeansTargetFolder(folder.newFolder("beans")); + config.setTargetFolder(folder); + config.setBeansTargetFolder( + java.nio.file.Files.createDirectories(new File(folder, "beans").toPath()).toFile()); config.setExportBeans(true); var exporter = new MetaDataExporter(config); exporter.export(metadata); - assertThat(new File(folder.getRoot(), "test/DateTest.java")).exists(); - assertThat(new File(folder.getRoot(), "beans/test/DateTestBean.java")).exists(); + assertThat(new File(folder, "test/DateTest.java")).exists(); + assertThat(new File(folder, "beans/test/DateTestBean.java")).exists(); } // @Test FIXME can't get mysql admin access working with circle CI, might need to move to @@ -450,23 +455,23 @@ foo VARCHAR(32) NOT NULL)\ config.setNamePrefix(""); config.setBeanSuffix("Bean"); config.setBeanSerializerClass(BeanSerializer.class); - config.setTargetFolder(folder.getRoot()); - config.setBeansTargetFolder(folder.newFolder("beans")); + config.setTargetFolder(folder); + config.setBeansTargetFolder( + java.nio.file.Files.createDirectories(new File(folder, "beans").toPath()).toFile()); var exporter = new MetaDataExporter(config); exporter.export(connection.getMetaData()); - assertThat(new File(folder.getRoot(), "test/TestCatalogTableOne.java")).exists(); - assertThat(new File(folder.getRoot(), "beans/test/TestCatalogTableOneBean.java")).exists(); + assertThat(new File(folder, "test/TestCatalogTableOne.java")).exists(); + assertThat(new File(folder, "beans/test/TestCatalogTableOneBean.java")).exists(); - assertThat(new File(folder.getRoot(), "test/TestCatalogTableTwo.java").exists()).isFalse(); - assertThat(new File(folder.getRoot(), "beans/test/TestCatalogTableTwoBean.java").exists()) - .isFalse(); + assertThat(new File(folder, "test/TestCatalogTableTwo.java").exists()).isFalse(); + assertThat(new File(folder, "beans/test/TestCatalogTableTwoBean.java").exists()).isFalse(); config.setCatalogPattern("catalog_test_two"); exporter.export(connection.getMetaData()); - assertThat(new File(folder.getRoot(), "test/TestCatalogTableTwo.java")).exists(); - assertThat(new File(folder.getRoot(), "beans/test/TestCatalogTableTwoBean.java")).exists(); + assertThat(new File(folder, "test/TestCatalogTableTwo.java")).exists(); + assertThat(new File(folder, "beans/test/TestCatalogTableTwoBean.java")).exists(); } finally { stmt.execute("DROP DATABASE IF EXISTS catalog_test_one"); stmt.execute("DROP DATABASE IF EXISTS catalog_test_two"); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java index 80551e9675..cbf96362b8 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataSerializerTest.java @@ -13,7 +13,6 @@ */ package com.querydsl.sql.codegen; -import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -24,24 +23,24 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.SQLTemplates; import com.querydsl.sql.types.AbstractType; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import javax.tools.JavaCompiler; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; public class MetaDataSerializerTest extends AbstractJDBCTest { public static class CustomNumber {} - @Rule public TemporaryFolder folder = new TemporaryFolder(); + @TempDir File folder; @Override - @Before + @BeforeEach public void setUp() throws SQLException, ClassNotFoundException { super.setUp(); statement.execute("drop table employee if exists"); @@ -93,7 +92,7 @@ public void normal_serialization() throws SQLException { config.setBeanSerializerClass(BeanSerializer.class); config.setNamePrefix(namePrefix); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setNamingStrategyClass(DefaultNamingStrategy.class); config.setExportBeans(true); var exporter = new MetaDataExporter(config); @@ -149,7 +148,7 @@ public void setValue(PreparedStatement st, int startIndex, CustomNumber value) config.setBeanSerializerClass(BeanSerializer.class); config.setNamePrefix(namePrefix); config.setPackageName("test"); - config.setTargetFolder(folder.getRoot()); + config.setTargetFolder(folder); config.setNamingStrategyClass(DefaultNamingStrategy.class); config.setGeneratedAnnotationClass("com.querydsl.core.annotations.Generated"); config.setExportBeans(true); @@ -190,7 +189,7 @@ private void compile(MetaDataExporter exporter) { } private void assertFileContainsInOrder(String path, String... methods) throws IOException { - var content = new String(Files.readAllBytes(folder.getRoot().toPath().resolve(path)), UTF_8); + var content = Files.readString(folder.toPath().resolve(path)); assertThat(content).containsIgnoringWhitespaces(methods); } } diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java index 9e2b9fc05a..0b91eb543c 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/MetaDataTest.java @@ -19,14 +19,14 @@ import com.querydsl.codegen.utils.model.SimpleType; import com.querydsl.codegen.utils.model.Type; import com.querydsl.codegen.utils.model.TypeCategory; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MetaDataTest { private EntityType classModel; - @Before + @BeforeEach public void setUp() { NamingStrategy namingStrategy = new DefaultNamingStrategy(); var packageName = "com.myproject.domain"; diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java index 43ebca3d80..9ee9e94d77 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/OriginalNamingStrategyTest.java @@ -17,8 +17,8 @@ import com.querydsl.codegen.EntityType; import com.querydsl.codegen.utils.model.Types; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class OriginalNamingStrategyTest { @@ -26,7 +26,7 @@ public class OriginalNamingStrategyTest { private EntityType entityModel; - @Before + @BeforeEach public void setUp() { entityModel = new EntityType(Types.OBJECT); // entityModel.addAnnotation(new TableImpl("OBJECT")); diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java index 5cbe9202e6..793482b7ea 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ant/AntMetaDataExporterTest.java @@ -20,14 +20,14 @@ import java.sql.SQLException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class AntMetaDataExporterTest { private static final String url = "jdbc:h2:./target/dbs/h2_AntMetaDataExporterTest;MODE=legacy"; - @BeforeClass + @BeforeAll public static void setUp() throws SQLException { try (var conn = DriverManager.getConnection(url, "sa", "")) { try (var stmt = conn.createStatement()) { diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java index c78db61d9f..9ab789e5dd 100644 --- a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/support/RenameMappingTest.java @@ -5,7 +5,7 @@ import com.querydsl.sql.Configuration; import com.querydsl.sql.SQLTemplates; import com.querydsl.sql.SchemaAndTable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RenameMappingTest { From 16bac7ea74c84ba650580bcd6345689d6647091d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 05:23:28 +0000 Subject: [PATCH 32/62] Build(deps): Bump spring.version from 7.0.7 to 7.0.8 Bumps `spring.version` from 7.0.7 to 7.0.8. Updates `org.springframework:spring-jdbc` from 7.0.7 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.7...v7.0.8) Updates `org.springframework:spring-test` from 7.0.7 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.7...v7.0.8) Updates `org.springframework:spring-context` from 7.0.7 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.7...v7.0.8) Updates `org.springframework:spring-aop` from 7.0.7 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.7...v7.0.8) --- updated-dependencies: - dependency-name: org.springframework:spring-jdbc dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-test dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-aop dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a2b9c190..f90a779910 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 3.45.0 3.2.1 4.0.6 - 7.0.7 + 7.0.8 12.1.4.0 From 32598ed06dba294250b14ff1b74f3318b5cce39b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 05:23:55 +0000 Subject: [PATCH 33/62] Build(deps-dev): Bump org.eclipse.jdt:ecj from 3.45.0 to 3.46.0 Bumps [org.eclipse.jdt:ecj](https://github.com/eclipse-jdt/eclipse.jdt.core) from 3.45.0 to 3.46.0. - [Commits](https://github.com/eclipse-jdt/eclipse.jdt.core/commits) --- updated-dependencies: - dependency-name: org.eclipse.jdt:ecj dependency-version: 3.46.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a2b9c190..398d8d95ba 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 6.0 6.1.0 - 3.45.0 + 3.46.0 3.2.1 4.0.6 7.0.7 From 07001b7ce18f9cf2fd7f7a39bd48944e18f3b124 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 05:24:27 +0000 Subject: [PATCH 34/62] Build(deps): Bump io.projectreactor:reactor-bom Bumps [io.projectreactor:reactor-bom](https://github.com/reactor/reactor) from 2025.0.5 to 2025.0.6. - [Release notes](https://github.com/reactor/reactor/releases) - [Commits](https://github.com/reactor/reactor/compare/2025.0.5...2025.0.6) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-bom dependency-version: 2025.0.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a2b9c190..40e618c728 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ io.projectreactor reactor-bom - 2025.0.5 + 2025.0.6 pom import From 635c4dbc3c1171dd42dc8a04e7073183e494fde9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2026 05:24:31 +0000 Subject: [PATCH 35/62] Build(deps): Bump io.smallrye:jandex from 3.5.3 to 3.6.0 Bumps [io.smallrye:jandex](https://github.com/smallrye/jandex) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/smallrye/jandex/releases) - [Changelog](https://github.com/smallrye/jandex/blob/main/RELEASE_PROCEDURE.md) - [Commits](https://github.com/smallrye/jandex/compare/3.5.3...3.6.0) --- updated-dependencies: - dependency-name: io.smallrye:jandex dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a2b9c190..228717cbf2 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ io.smallrye jandex - 3.5.3 + 3.6.0 org.jetbrains From 998aad06b379ac16e9ceb1af0eec9cabc5931f4a Mon Sep 17 00:00:00 2001 From: seonwoojung Date: Tue, 9 Jun 2026 20:18:19 +0900 Subject: [PATCH 36/62] Render object arrays as Kotlin Array in querydsl-kotlin-codegen (#1790) (#1791) Render object arrays as Kotlin Array in querydsl-kotlin-codegen Object array properties (e.g. String[]) were emitted with Java array syntax (ArrayPath = createArray("tags", String[]::class.java)), which is not valid Kotlin and fails to compile. Map object arrays to the Kotlin Array type and the Array::class.java class literal, while keeping primitive arrays (int[], byte[], ...) on their dedicated Kotlin array classes (IntArray, ByteArray, ...). Fixes #1790 Signed-off-by: seonwoo_jung <79202163+seonwooj0810@users.noreply.github.com> --- .../com/querydsl/kotlin/codegen/Extensions.kt | 27 ++++++++++++++++--- .../kotlin/codegen/EntitySerializerTest.kt | 12 +++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/querydsl-tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt b/querydsl-tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt index 23ebd30d63..71644e6298 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt +++ b/querydsl-tooling/querydsl-kotlin-codegen/src/main/kotlin/com/querydsl/kotlin/codegen/Extensions.kt @@ -27,10 +27,26 @@ import com.squareup.kotlinpoet.asTypeName import com.squareup.kotlinpoet.joinToCode import kotlin.reflect.KClass +private val PRIMITIVE_ARRAY_FULL_NAMES = + setOf("boolean[]", "byte[]", "char[]", "short[]", "int[]", "long[]", "float[]", "double[]") + +// Component type of an object array (e.g. String[]), or null for non-arrays and primitive +// arrays. Primitive arrays (int[], byte[], ...) keep their dedicated Kotlin array class +// (IntArray, ByteArray, ...) via asClassName() and must not be wrapped in Array. +private fun Type.objectArrayComponentType(): Type? = + componentType?.takeUnless { fullName in PRIMITIVE_ARRAY_FULL_NAMES } + @JvmOverloads -fun Type.asTypeName(out: Boolean = false): TypeName = asClassName().let { className -> - if (parameters.isNotEmpty()) - className.parameterizedBy(*parameters.map { if (out) it.asOutTypeName() else it.asTypeName() }.toTypedArray()) else className +fun Type.asTypeName(out: Boolean = false): TypeName { + // Object arrays (e.g. String[]) must be rendered as the Kotlin Array type. + objectArrayComponentType()?.let { component -> + return Array::class.asClassName() + .parameterizedBy(if (out) component.asOutTypeName() else component.asTypeName()) + } + return asClassName().let { className -> + if (parameters.isNotEmpty()) + className.parameterizedBy(*parameters.map { if (out) it.asOutTypeName() else it.asTypeName() }.toTypedArray()) else className + } } fun Type.asClassName(): ClassName = when (this.fullName) { @@ -67,7 +83,10 @@ private fun Type.enclosingTypeHierarchy(): List { fun ClassName.asClassStatement() = CodeBlock.of("%T::class.java", this) -fun Type.asClassNameStatement() = asClassName().asClassStatement() +fun Type.asClassNameStatement(): CodeBlock = + // Object arrays need the Kotlin Array::class.java form to resolve to the right runtime class. + objectArrayComponentType()?.let { CodeBlock.of("%T::class.java", asTypeName()) } + ?: asClassName().asClassStatement() fun TypeMappings.getPathClassName(type: Type, model: EntityType) = getPathType(type, model, true).asClassName() diff --git a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt index 4bc961032d..03352088cd 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt +++ b/querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EntitySerializerTest.kt @@ -117,6 +117,18 @@ class EntitySerializerTest { assertCompiles("QEntity", writer.toString()) } + @Test + fun object_array() { + val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false) + val entityType = EntityType(type) + entityType.addProperty(Property(entityType, "tags", ClassType(TypeCategory.ARRAY, Array::class.java))) + typeMappings.register(entityType, queryTypeFactory.create(entityType)) + serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer)) + Assertions.assertTrue(writer.toString().contains("val tags: ArrayPath, String>")) + Assertions.assertTrue(writer.toString().contains("createArray(\"tags\", Array::class.java)")) + assertCompiles("QEntity", writer.toString()) + } + @Test fun include() { val type = SimpleType(TypeCategory.ENTITY, "Entity", "", "Entity", false, false) From 42dc41ca1f18030ddd88a4577bbd0b3cb40139cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:23:22 +0000 Subject: [PATCH 37/62] Build(deps): Bump hibernate.version from 7.4.0.Final to 7.4.1.Final Bumps `hibernate.version` from 7.4.0.Final to 7.4.1.Final. Updates `org.hibernate.orm:hibernate-core` from 7.4.0.Final to 7.4.1.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.1/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.0...7.4.1) Updates `org.hibernate.orm:hibernate-envers` from 7.4.0.Final to 7.4.1.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.1/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.0...7.4.1) Updates `org.hibernate.orm:hibernate-scan-jandex` from 7.4.0.Final to 7.4.1.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.1/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.0...7.4.1) Updates `org.hibernate.orm:hibernate-community-dialects` from 7.4.0.Final to 7.4.1.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.1/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.0...7.4.1) Updates `org.hibernate.orm:hibernate-c3p0` from 7.4.0.Final to 7.4.1.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.1/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.0...7.4.1) --- updated-dependencies: - dependency-name: org.hibernate.orm:hibernate-core dependency-version: 7.4.1.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.hibernate.orm:hibernate-envers dependency-version: 7.4.1.Final dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.hibernate.orm:hibernate-scan-jandex dependency-version: 7.4.1.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.hibernate.orm:hibernate-community-dialects dependency-version: 7.4.1.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.hibernate.orm:hibernate-c3p0 dependency-version: 7.4.1.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 938a80ffe0..0770ac1950 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ 1.0.0.RELEASE - 7.4.0.Final + 7.4.1.Final 9.1.0.Final 5.0.0-B13 3.2.0 From ad54a63d8c8480df7dd5361f0fb17639d26f6958 Mon Sep 17 00:00:00 2001 From: "Kay J." Date: Wed, 10 Jun 2026 13:15:48 +0200 Subject: [PATCH 38/62] Add flatten-maven-plugin to querydsl-bom (#1796) --- pom.xml | 2 ++ querydsl-bom/pom.xml | 35 ++++++++++++++++++++++++++ src/main/resources/bom-template.xml.vm | 35 ++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/pom.xml b/pom.xml index 0770ac1950..bfe345bc51 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,8 @@ 6.0 + 1.7.3 + 6.1.0 3.46.0 3.2.1 diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 146627564e..989b7e1832 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -208,4 +208,39 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + false + + + + flatten + + flatten + + process-resources + + true + bom + + remove + keep + remove + remove + remove + remove + remove + remove + + + + + + + diff --git a/src/main/resources/bom-template.xml.vm b/src/main/resources/bom-template.xml.vm index 75df877a0f..9137cb5706 100644 --- a/src/main/resources/bom-template.xml.vm +++ b/src/main/resources/bom-template.xml.vm @@ -47,4 +47,39 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + false + + + + flatten + process-resources + + flatten + + + true + bom + + remove + keep + remove + remove + remove + remove + remove + remove + + + + + + + From 3bd5afb4aa409730019b44d69a8c99c1e8a8a67e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 05:34:01 +0000 Subject: [PATCH 39/62] Build(deps): Bump springboot.version from 4.0.6 to 4.1.0 Bumps `springboot.version` from 4.0.6 to 4.1.0. Updates `org.springframework.boot:spring-boot-dependencies` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v4.0.6...v4.1.0) Updates `org.springframework.boot:spring-boot-maven-plugin` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v4.0.6...v4.1.0) Updates `org.springframework.boot:spring-boot-starter-parent` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v4.0.6...v4.1.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfe345bc51..1079d0b08e 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 6.1.0 3.46.0 3.2.1 - 4.0.6 + 4.1.0 7.0.8 From 4b1640b3123a2edc98d7407add65d8143e23eb1e Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Thu, 11 Jun 2026 07:43:32 -0300 Subject: [PATCH 40/62] Centralize jackson version in a single jackson.version property Signed-off-by: Marvin Froeder --- pom.xml | 1 + querydsl-examples/querydsl-example-kotlin-codegen/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..a5b12e4291 100644 --- a/pom.xml +++ b/pom.xml @@ -127,6 +127,7 @@ 3.27.7 3.9.16 33.6.0-jre + 2.22.0 0.6.8 1.18.8 2.0.18 diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 317792a8df..83b7c3c409 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -28,7 +28,7 @@ com.fasterxml.jackson.module jackson-module-kotlin - 2.21.4 + ${jackson.version} org.jetbrains.kotlin diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index d1b9318214..4214176084 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -17,7 +17,7 @@ com.fasterxml.jackson jackson-bom - 2.22.0 + ${jackson.version} pom import From 678bda2235698a3f0ea31194a5b66c43457489cf Mon Sep 17 00:00:00 2001 From: Marvin Froeder Date: Thu, 11 Jun 2026 07:44:44 -0300 Subject: [PATCH 41/62] Centralize kctfork version in a single kctfork.version property Signed-off-by: Marvin Froeder --- pom.xml | 1 + querydsl-tooling/querydsl-ksp-codegen/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 277ed422b7..bd7eacc1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,7 @@ 1.37 2.3.21 2.3.9 + 0.13.0 2.3.0 2.2.0 2.13.16 diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 065c78de93..be9d6a02e7 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -61,13 +61,13 @@ dev.zacsweers.kctfork core - 0.13.0 + ${kctfork.version} test dev.zacsweers.kctfork ksp - 0.13.0 + ${kctfork.version} test + + io.netty + netty-bom + 4.1.135.Final + pom + import + io.quarkus.platform quarkus-bom From 4f2fa33276d78558dcd419c6df9f0d9396cdf02c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 05:23:11 +0000 Subject: [PATCH 45/62] Build(deps): Bump quarkus.version from 3.36.1 to 3.36.2 Bumps `quarkus.version` from 3.36.1 to 3.36.2. Updates `io.quarkus.platform:quarkus-bom` from 3.36.1 to 3.36.2 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.1...3.36.2) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.36.1 to 3.36.2 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.1...3.36.2) --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-version: 3.36.2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-version: 3.36.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-examples/querydsl-example-jpa-quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 1cbf7a81fe..d370989671 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -12,7 +12,7 @@ Querydsl example - JPA Quarkus - 3.36.1 + 3.36.2 From 15f75202a211d8a12fedd1d737da5e5a8f57ea5d Mon Sep 17 00:00:00 2001 From: velo Date: Sat, 13 Jun 2026 13:55:06 -0300 Subject: [PATCH 46/62] [ci skip] updating versions to next development iteration 7.4-SNAPSHOT --- pom.xml | 2 +- querydsl-bom/pom.xml | 70 +++++++++---------- querydsl-examples/pom.xml | 2 +- .../querydsl-example-jpa-guice/pom.xml | 2 +- .../querydsl-example-jpa-quarkus/pom.xml | 2 +- .../querydsl-example-jpa-spring/pom.xml | 2 +- .../querydsl-example-kotlin-codegen/pom.xml | 2 +- .../querydsl-example-kotlin-jpa/pom.xml | 2 +- .../querydsl-example-kotlin-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../querydsl-example-sql-guice/pom.xml | 2 +- .../querydsl-example-sql-spring/pom.xml | 2 +- querydsl-libraries/pom.xml | 2 +- .../querydsl-collections/pom.xml | 2 +- querydsl-libraries/querydsl-core/pom.xml | 2 +- querydsl-libraries/querydsl-guava/pom.xml | 2 +- .../querydsl-jpa-spring/pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 2 +- querydsl-libraries/querydsl-kotlin/pom.xml | 2 +- querydsl-libraries/querydsl-mongodb/pom.xml | 2 +- querydsl-libraries/querydsl-r2dbc/pom.xml | 2 +- querydsl-libraries/querydsl-scala/pom.xml | 2 +- querydsl-libraries/querydsl-spatial/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- .../querydsl-sql-spatial/pom.xml | 2 +- .../querydsl-sql-spring/pom.xml | 2 +- querydsl-libraries/querydsl-sql/pom.xml | 2 +- querydsl-tooling/pom.xml | 2 +- querydsl-tooling/querydsl-apt-test/pom.xml | 2 +- querydsl-tooling/querydsl-apt/pom.xml | 2 +- .../querydsl-codegen-utils/pom.xml | 2 +- querydsl-tooling/querydsl-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-jpa-codegen/pom.xml | 2 +- .../querydsl-kotlin-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- .../querydsl-maven-plugin/pom.xml | 2 +- querydsl-tooling/querydsl-sql-codegen/pom.xml | 2 +- 37 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index ec8cdd309c..87d4a8b28c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.openfeign.querydsl querydsl-root - 7.3-SNAPSHOT + 7.4-SNAPSHOT pom Querydsl diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 989b7e1832..803799edb0 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -11,7 +11,7 @@ io.github.openfeign.querydsl querydsl-root - 7.3-SNAPSHOT + 7.4-SNAPSHOT ../pom.xml @@ -25,185 +25,185 @@ io.github.openfeign.querydsl querydsl-core - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen-utils - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-spatial - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-sql - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-codegen - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-maven-plugin - 7.3-SNAPSHOT + 7.4-SNAPSHOT maven-plugin io.github.openfeign.querydsl querydsl-jpa - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-jpa-codegen - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin-codegen - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-ksp-codegen - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-guava - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-collections - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spatial - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spring - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-json - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-r2dbc - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-mongodb - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-scala - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT general io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT hibernate io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT jakarta io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT jdo io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT jpa io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT morphia io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT roo io.github.openfeign.querydsl querydsl-apt - 7.3-SNAPSHOT + 7.4-SNAPSHOT general-one io.github.openfeign.querydsl querydsl-jpa - 7.3-SNAPSHOT + 7.4-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.3-SNAPSHOT + 7.4-SNAPSHOT apt-hibernate-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.3-SNAPSHOT + 7.4-SNAPSHOT apt io.github.openfeign.querydsl querydsl-mongodb - 7.3-SNAPSHOT + 7.4-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-mongodb - 7.3-SNAPSHOT + 7.4-SNAPSHOT apt diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index 0284c79d30..33c331ae24 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-examples diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index da20f6b2d0..56f58c6539 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-jpa-guice diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index d370989671..1af920a812 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-jpa-quarkus diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml index e7fb9004cf..5a908df4f0 100755 --- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-spring/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-jpa-spring diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 83b7c3c409..01dc7b0a59 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-kotlin-codegen Querydsl example - Kotlin Codegen diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml index 2747b701f9..a01cefbce7 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-kotlin Querydsl example - Kotlin JPA diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml index edde7ea173..af4740e71a 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-kotlin-mongodb Querydsl example - Kotlin MongoDB diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml index dab5f9a766..8ba3a647fe 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-r2dbc-sql-codegen diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml index 3d91e960df..6d0a831dc0 100644 --- a/querydsl-examples/querydsl-example-sql-guice/pom.xml +++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-sql-guice diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml index 43386e7995..0a7298400b 100644 --- a/querydsl-examples/querydsl-example-sql-spring/pom.xml +++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-example-sql-spring diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index fbe0885291..c4e8c0bf39 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-libraries diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml index 96974ae5ae..cdeb63e621 100644 --- a/querydsl-libraries/querydsl-collections/pom.xml +++ b/querydsl-libraries/querydsl-collections/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT io.github.openfeign.querydsl diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index 91a87febc8..7bdec7fea7 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-core diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml index deef070982..33141bc5a4 100644 --- a/querydsl-libraries/querydsl-guava/pom.xml +++ b/querydsl-libraries/querydsl-guava/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-guava diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml index b6a6d250cc..5eb9831840 100644 --- a/querydsl-libraries/querydsl-jpa-spring/pom.xml +++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-jpa-spring diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index 95f82f1938..aa1e250a63 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-jpa diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml index cfed241614..1310b0b5bc 100644 --- a/querydsl-libraries/querydsl-kotlin/pom.xml +++ b/querydsl-libraries/querydsl-kotlin/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-kotlin diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml index 2c375213a8..941c480bda 100644 --- a/querydsl-libraries/querydsl-mongodb/pom.xml +++ b/querydsl-libraries/querydsl-mongodb/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-mongodb diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml index 7ad9a898c9..08ee5a953c 100644 --- a/querydsl-libraries/querydsl-r2dbc/pom.xml +++ b/querydsl-libraries/querydsl-r2dbc/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-r2dbc diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml index 5267c6511c..0c3b006aee 100644 --- a/querydsl-libraries/querydsl-scala/pom.xml +++ b/querydsl-libraries/querydsl-scala/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-scala diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml index 2c2c13f1d4..67297a7d5f 100644 --- a/querydsl-libraries/querydsl-spatial/pom.xml +++ b/querydsl-libraries/querydsl-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-spatial diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index 4214176084..e9320af7da 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-sql-json diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index fa7666ccfa..8aeae4a30b 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-sql-spatial diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml index ca08398740..e73992254a 100644 --- a/querydsl-libraries/querydsl-sql-spring/pom.xml +++ b/querydsl-libraries/querydsl-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-sql-spring diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index 59da554c98..8fd01b1fd9 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-sql diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index 08c0e8cd8d..fe101029e4 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-tooling diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml index caa12156ee..cdbc665cf1 100644 --- a/querydsl-tooling/querydsl-apt-test/pom.xml +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-apt-test diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index 57b7b16540..ad0cc47a7d 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-apt diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml index bbb437e867..a9cedeaeb5 100644 --- a/querydsl-tooling/querydsl-codegen-utils/pom.xml +++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml @@ -6,7 +6,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-codegen-utils diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml index c248f20972..d9dff1892d 100644 --- a/querydsl-tooling/querydsl-codegen/pom.xml +++ b/querydsl-tooling/querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-codegen diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml index 4d63157798..4049023974 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml +++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml index 04d80dc402..5d39282789 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml +++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-kotlin-codegen diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index be9d6a02e7..9b24d29dd2 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-ksp-codegen diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml index 98eee4bee5..2a726d5c67 100644 --- a/querydsl-tooling/querydsl-maven-plugin/pom.xml +++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-maven-plugin diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index dec6bcad0d..d6b9d29e66 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.3-SNAPSHOT + 7.4-SNAPSHOT querydsl-sql-codegen From 4e27a40eb8039169c98caae2b0bb2ff3b4635733 Mon Sep 17 00:00:00 2001 From: velo Date: Mon, 15 Jun 2026 10:30:58 -0300 Subject: [PATCH 47/62] prepare release 7.4.0 --- pom.xml | 2 +- querydsl-bom/pom.xml | 70 +++++++++---------- querydsl-examples/pom.xml | 2 +- .../querydsl-example-jpa-guice/pom.xml | 2 +- .../querydsl-example-jpa-quarkus/pom.xml | 2 +- .../querydsl-example-jpa-spring/pom.xml | 2 +- .../querydsl-example-kotlin-codegen/pom.xml | 2 +- .../querydsl-example-kotlin-jpa/pom.xml | 2 +- .../querydsl-example-kotlin-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../querydsl-example-sql-guice/pom.xml | 2 +- .../querydsl-example-sql-spring/pom.xml | 2 +- querydsl-libraries/pom.xml | 2 +- .../querydsl-collections/pom.xml | 2 +- querydsl-libraries/querydsl-core/pom.xml | 2 +- querydsl-libraries/querydsl-guava/pom.xml | 2 +- .../querydsl-jpa-spring/pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 2 +- querydsl-libraries/querydsl-kotlin/pom.xml | 2 +- querydsl-libraries/querydsl-mongodb/pom.xml | 2 +- querydsl-libraries/querydsl-r2dbc/pom.xml | 2 +- querydsl-libraries/querydsl-scala/pom.xml | 2 +- querydsl-libraries/querydsl-spatial/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- .../querydsl-sql-spatial/pom.xml | 2 +- .../querydsl-sql-spring/pom.xml | 2 +- querydsl-libraries/querydsl-sql/pom.xml | 2 +- querydsl-tooling/pom.xml | 2 +- querydsl-tooling/querydsl-apt-test/pom.xml | 2 +- querydsl-tooling/querydsl-apt/pom.xml | 2 +- .../querydsl-codegen-utils/pom.xml | 2 +- querydsl-tooling/querydsl-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-jpa-codegen/pom.xml | 2 +- .../querydsl-kotlin-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- .../querydsl-maven-plugin/pom.xml | 2 +- querydsl-tooling/querydsl-sql-codegen/pom.xml | 2 +- 37 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 87d4a8b28c..4cb6abce5a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.openfeign.querydsl querydsl-root - 7.4-SNAPSHOT + 7.4.0 pom Querydsl diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 803799edb0..0c295d98f0 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -11,7 +11,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4-SNAPSHOT + 7.4.0 ../pom.xml @@ -25,185 +25,185 @@ io.github.openfeign.querydsl querydsl-core - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-codegen-utils - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-codegen - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-spatial - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-codegen - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-maven-plugin - 7.4-SNAPSHOT + 7.4.0 maven-plugin io.github.openfeign.querydsl querydsl-jpa - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-jpa-codegen - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-kotlin-codegen - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-ksp-codegen - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-guava - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-collections - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-spatial - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-spring - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-json - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-r2dbc - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-mongodb - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-scala - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-kotlin - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 general io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 hibernate io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 jakarta io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 jdo io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 jpa io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 morphia io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 roo io.github.openfeign.querydsl querydsl-apt - 7.4-SNAPSHOT + 7.4.0 general-one io.github.openfeign.querydsl querydsl-jpa - 7.4-SNAPSHOT + 7.4.0 apt-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4-SNAPSHOT + 7.4.0 apt-hibernate-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4-SNAPSHOT + 7.4.0 apt io.github.openfeign.querydsl querydsl-mongodb - 7.4-SNAPSHOT + 7.4.0 apt-one-jar io.github.openfeign.querydsl querydsl-mongodb - 7.4-SNAPSHOT + 7.4.0 apt diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index 33c331ae24..66e6e9fcee 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4-SNAPSHOT + 7.4.0 querydsl-examples diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index 56f58c6539..bb7501af56 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-jpa-guice diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 1af920a812..877cadac4e 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-jpa-quarkus diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml index 5a908df4f0..70ece1b988 100755 --- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-spring/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-jpa-spring diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 01dc7b0a59..6fec026003 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-kotlin-codegen Querydsl example - Kotlin Codegen diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml index a01cefbce7..ab98e0df24 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-kotlin Querydsl example - Kotlin JPA diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml index af4740e71a..423f44049c 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-kotlin-mongodb Querydsl example - Kotlin MongoDB diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml index 8ba3a647fe..29ca310a44 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-r2dbc-sql-codegen diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml index 6d0a831dc0..0020bbf6d3 100644 --- a/querydsl-examples/querydsl-example-sql-guice/pom.xml +++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-sql-guice diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml index 0a7298400b..0291ced912 100644 --- a/querydsl-examples/querydsl-example-sql-spring/pom.xml +++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4-SNAPSHOT + 7.4.0 querydsl-example-sql-spring diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index c4e8c0bf39..32354b045f 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4-SNAPSHOT + 7.4.0 querydsl-libraries diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml index cdeb63e621..e0c6b4ed47 100644 --- a/querydsl-libraries/querydsl-collections/pom.xml +++ b/querydsl-libraries/querydsl-collections/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index 7bdec7fea7..c744631612 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-core diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml index 33141bc5a4..1a1f4c2ad5 100644 --- a/querydsl-libraries/querydsl-guava/pom.xml +++ b/querydsl-libraries/querydsl-guava/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-guava diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml index 5eb9831840..d0c74ff0c6 100644 --- a/querydsl-libraries/querydsl-jpa-spring/pom.xml +++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-jpa-spring diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index aa1e250a63..01b4044019 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-jpa diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml index 1310b0b5bc..57f00a3c2e 100644 --- a/querydsl-libraries/querydsl-kotlin/pom.xml +++ b/querydsl-libraries/querydsl-kotlin/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-kotlin diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml index 941c480bda..31f952451f 100644 --- a/querydsl-libraries/querydsl-mongodb/pom.xml +++ b/querydsl-libraries/querydsl-mongodb/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-mongodb diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml index 08ee5a953c..c67716923c 100644 --- a/querydsl-libraries/querydsl-r2dbc/pom.xml +++ b/querydsl-libraries/querydsl-r2dbc/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-r2dbc diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml index 0c3b006aee..7260a264a8 100644 --- a/querydsl-libraries/querydsl-scala/pom.xml +++ b/querydsl-libraries/querydsl-scala/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-scala diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml index 67297a7d5f..9e1a9845f3 100644 --- a/querydsl-libraries/querydsl-spatial/pom.xml +++ b/querydsl-libraries/querydsl-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-spatial diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index e9320af7da..0abebd3265 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-sql-json diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index 8aeae4a30b..836651d8a7 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-sql-spatial diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml index e73992254a..55447c9a89 100644 --- a/querydsl-libraries/querydsl-sql-spring/pom.xml +++ b/querydsl-libraries/querydsl-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-sql-spring diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index 8fd01b1fd9..b96b6ac9a7 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4-SNAPSHOT + 7.4.0 querydsl-sql diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index fe101029e4..b14fd9b293 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4-SNAPSHOT + 7.4.0 querydsl-tooling diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml index cdbc665cf1..6dd0b4af64 100644 --- a/querydsl-tooling/querydsl-apt-test/pom.xml +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-apt-test diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index ad0cc47a7d..52da0148ae 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-apt diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml index a9cedeaeb5..fa17f77d90 100644 --- a/querydsl-tooling/querydsl-codegen-utils/pom.xml +++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml @@ -6,7 +6,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-codegen-utils diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml index d9dff1892d..6b160fb341 100644 --- a/querydsl-tooling/querydsl-codegen/pom.xml +++ b/querydsl-tooling/querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-codegen diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml index 4049023974..e5322cddaf 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml +++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml index 5d39282789..f657047ba1 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml +++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-kotlin-codegen diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 9b24d29dd2..efcbde5ca9 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-ksp-codegen diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml index 2a726d5c67..3659e4f6f5 100644 --- a/querydsl-tooling/querydsl-maven-plugin/pom.xml +++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-maven-plugin diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index d6b9d29e66..1e2887f5b2 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4-SNAPSHOT + 7.4.0 querydsl-sql-codegen From 115016aaad1f6e3cfbb482ab69a28e05037f5264 Mon Sep 17 00:00:00 2001 From: velo Date: Mon, 15 Jun 2026 10:31:02 -0300 Subject: [PATCH 48/62] [ci skip] updating versions to next development iteration 7.5-SNAPSHOT --- pom.xml | 2 +- querydsl-bom/pom.xml | 70 +++++++++---------- querydsl-examples/pom.xml | 2 +- .../querydsl-example-jpa-guice/pom.xml | 2 +- .../querydsl-example-jpa-quarkus/pom.xml | 2 +- .../querydsl-example-jpa-spring/pom.xml | 2 +- .../querydsl-example-kotlin-codegen/pom.xml | 2 +- .../querydsl-example-kotlin-jpa/pom.xml | 2 +- .../querydsl-example-kotlin-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../querydsl-example-sql-guice/pom.xml | 2 +- .../querydsl-example-sql-spring/pom.xml | 2 +- querydsl-libraries/pom.xml | 2 +- .../querydsl-collections/pom.xml | 2 +- querydsl-libraries/querydsl-core/pom.xml | 2 +- querydsl-libraries/querydsl-guava/pom.xml | 2 +- .../querydsl-jpa-spring/pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 2 +- querydsl-libraries/querydsl-kotlin/pom.xml | 2 +- querydsl-libraries/querydsl-mongodb/pom.xml | 2 +- querydsl-libraries/querydsl-r2dbc/pom.xml | 2 +- querydsl-libraries/querydsl-scala/pom.xml | 2 +- querydsl-libraries/querydsl-spatial/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- .../querydsl-sql-spatial/pom.xml | 2 +- .../querydsl-sql-spring/pom.xml | 2 +- querydsl-libraries/querydsl-sql/pom.xml | 2 +- querydsl-tooling/pom.xml | 2 +- querydsl-tooling/querydsl-apt-test/pom.xml | 2 +- querydsl-tooling/querydsl-apt/pom.xml | 2 +- .../querydsl-codegen-utils/pom.xml | 2 +- querydsl-tooling/querydsl-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-jpa-codegen/pom.xml | 2 +- .../querydsl-kotlin-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- .../querydsl-maven-plugin/pom.xml | 2 +- querydsl-tooling/querydsl-sql-codegen/pom.xml | 2 +- 37 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 4cb6abce5a..92dfd5c118 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT pom Querydsl diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 0c295d98f0..c7a217016d 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -11,7 +11,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT ../pom.xml @@ -25,185 +25,185 @@ io.github.openfeign.querydsl querydsl-core - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen-utils - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-spatial - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-maven-plugin - 7.4.0 + 7.5-SNAPSHOT maven-plugin io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-jpa-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-ksp-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-guava - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-collections - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spatial - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spring - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-json - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-r2dbc - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-scala - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT general io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT hibernate io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jakarta io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jdo io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jpa io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT morphia io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT roo io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT general-one io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt-hibernate-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT apt diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index 66e6e9fcee..9654d63dcc 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-examples diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index bb7501af56..bf76b2ed6e 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-guice diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 877cadac4e..9e66766a85 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-quarkus diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml index 70ece1b988..14586f020f 100755 --- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-spring/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-spring diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 6fec026003..602b548166 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin-codegen Querydsl example - Kotlin Codegen diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml index ab98e0df24..2c54a6a88e 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin Querydsl example - Kotlin JPA diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml index 423f44049c..64be78137d 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin-mongodb Querydsl example - Kotlin MongoDB diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml index 29ca310a44..7596589340 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-r2dbc-sql-codegen diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml index 0020bbf6d3..466fc12c02 100644 --- a/querydsl-examples/querydsl-example-sql-guice/pom.xml +++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-sql-guice diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml index 0291ced912..b32020d9ad 100644 --- a/querydsl-examples/querydsl-example-sql-spring/pom.xml +++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-sql-spring diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index 32354b045f..5bbd59b8f7 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-libraries diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml index e0c6b4ed47..18bbb03b91 100644 --- a/querydsl-libraries/querydsl-collections/pom.xml +++ b/querydsl-libraries/querydsl-collections/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index c744631612..57a76aa89d 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-core diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml index 1a1f4c2ad5..57782e59e5 100644 --- a/querydsl-libraries/querydsl-guava/pom.xml +++ b/querydsl-libraries/querydsl-guava/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-guava diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml index d0c74ff0c6..e6009bad05 100644 --- a/querydsl-libraries/querydsl-jpa-spring/pom.xml +++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa-spring diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index 01b4044019..30b0a33af9 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml index 57f00a3c2e..ae69a361a8 100644 --- a/querydsl-libraries/querydsl-kotlin/pom.xml +++ b/querydsl-libraries/querydsl-kotlin/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-kotlin diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml index 31f952451f..accac185fa 100644 --- a/querydsl-libraries/querydsl-mongodb/pom.xml +++ b/querydsl-libraries/querydsl-mongodb/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-mongodb diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml index c67716923c..ad83f3c4cf 100644 --- a/querydsl-libraries/querydsl-r2dbc/pom.xml +++ b/querydsl-libraries/querydsl-r2dbc/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-r2dbc diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml index 7260a264a8..d6dadfad09 100644 --- a/querydsl-libraries/querydsl-scala/pom.xml +++ b/querydsl-libraries/querydsl-scala/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-scala diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml index 9e1a9845f3..432acb452a 100644 --- a/querydsl-libraries/querydsl-spatial/pom.xml +++ b/querydsl-libraries/querydsl-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-spatial diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index 0abebd3265..5cc8924a59 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-json diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index 836651d8a7..f57b45b322 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-spatial diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml index 55447c9a89..0778d3adb0 100644 --- a/querydsl-libraries/querydsl-sql-spring/pom.xml +++ b/querydsl-libraries/querydsl-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-spring diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index b96b6ac9a7..6ba4fb6095 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index b14fd9b293..42beef718f 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-tooling diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml index 6dd0b4af64..a16f8ba978 100644 --- a/querydsl-tooling/querydsl-apt-test/pom.xml +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-apt-test diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index 52da0148ae..c5f261e2eb 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-apt diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml index fa17f77d90..b537e8b167 100644 --- a/querydsl-tooling/querydsl-codegen-utils/pom.xml +++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml @@ -6,7 +6,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-codegen-utils diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml index 6b160fb341..380be6015e 100644 --- a/querydsl-tooling/querydsl-codegen/pom.xml +++ b/querydsl-tooling/querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-codegen diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml index e5322cddaf..013a103932 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml +++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml index f657047ba1..0842d8edeb 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml +++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-kotlin-codegen diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index efcbde5ca9..638b418556 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-ksp-codegen diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml index 3659e4f6f5..5f055927f3 100644 --- a/querydsl-tooling/querydsl-maven-plugin/pom.xml +++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-maven-plugin diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index 1e2887f5b2..2492d0074e 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-codegen From dbbf2ec8b762f1c8d4c82fe1c9b796d83b936664 Mon Sep 17 00:00:00 2001 From: velo Date: Mon, 15 Jun 2026 10:24:40 -0400 Subject: [PATCH 49/62] querydsl-bom: keep in flattened pom (Maven Central requires Project URL) The flatten-maven-plugin config removed , so central-publishing rejected the BOM deployment ('Project URL is not defined') and 7.4.0 failed to publish. Declare an explicit project URL and keep it through flatten. --- querydsl-bom/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index c7a217016d..111edc234b 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -19,6 +19,7 @@ pom QueryDSL (Bill Of Materials) Generated Bom + https://querydsl.github.io/ @@ -235,7 +236,7 @@ remove remove remove - remove + keep From 7b5100816e1ba123be898c8106c63f023213414d Mon Sep 17 00:00:00 2001 From: velo Date: Mon, 15 Jun 2026 11:25:42 -0300 Subject: [PATCH 50/62] prepare release 7.4.0 --- pom.xml | 2 +- querydsl-bom/pom.xml | 70 +++++++++---------- querydsl-examples/pom.xml | 2 +- .../querydsl-example-jpa-guice/pom.xml | 2 +- .../querydsl-example-jpa-quarkus/pom.xml | 2 +- .../querydsl-example-jpa-spring/pom.xml | 2 +- .../querydsl-example-kotlin-codegen/pom.xml | 2 +- .../querydsl-example-kotlin-jpa/pom.xml | 2 +- .../querydsl-example-kotlin-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../querydsl-example-sql-guice/pom.xml | 2 +- .../querydsl-example-sql-spring/pom.xml | 2 +- querydsl-libraries/pom.xml | 2 +- .../querydsl-collections/pom.xml | 2 +- querydsl-libraries/querydsl-core/pom.xml | 2 +- querydsl-libraries/querydsl-guava/pom.xml | 2 +- .../querydsl-jpa-spring/pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 2 +- querydsl-libraries/querydsl-kotlin/pom.xml | 2 +- querydsl-libraries/querydsl-mongodb/pom.xml | 2 +- querydsl-libraries/querydsl-r2dbc/pom.xml | 2 +- querydsl-libraries/querydsl-scala/pom.xml | 2 +- querydsl-libraries/querydsl-spatial/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- .../querydsl-sql-spatial/pom.xml | 2 +- .../querydsl-sql-spring/pom.xml | 2 +- querydsl-libraries/querydsl-sql/pom.xml | 2 +- querydsl-tooling/pom.xml | 2 +- querydsl-tooling/querydsl-apt-test/pom.xml | 2 +- querydsl-tooling/querydsl-apt/pom.xml | 2 +- .../querydsl-codegen-utils/pom.xml | 2 +- querydsl-tooling/querydsl-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-jpa-codegen/pom.xml | 2 +- .../querydsl-kotlin-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- .../querydsl-maven-plugin/pom.xml | 2 +- querydsl-tooling/querydsl-sql-codegen/pom.xml | 2 +- 37 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 92dfd5c118..4cb6abce5a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.openfeign.querydsl querydsl-root - 7.5-SNAPSHOT + 7.4.0 pom Querydsl diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 111edc234b..3110f1382b 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -11,7 +11,7 @@ io.github.openfeign.querydsl querydsl-root - 7.5-SNAPSHOT + 7.4.0 ../pom.xml @@ -26,185 +26,185 @@ io.github.openfeign.querydsl querydsl-core - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-codegen-utils - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-codegen - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-spatial - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-codegen - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-maven-plugin - 7.5-SNAPSHOT + 7.4.0 maven-plugin io.github.openfeign.querydsl querydsl-jpa - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-jpa-codegen - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-kotlin-codegen - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-ksp-codegen - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-guava - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-collections - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-spatial - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-spring - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-sql-json - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-r2dbc - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-mongodb - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-scala - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-kotlin - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 general io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 hibernate io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 jakarta io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 jdo io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 jpa io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 morphia io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 roo io.github.openfeign.querydsl querydsl-apt - 7.5-SNAPSHOT + 7.4.0 general-one io.github.openfeign.querydsl querydsl-jpa - 7.5-SNAPSHOT + 7.4.0 apt-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.5-SNAPSHOT + 7.4.0 apt-hibernate-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.5-SNAPSHOT + 7.4.0 apt io.github.openfeign.querydsl querydsl-mongodb - 7.5-SNAPSHOT + 7.4.0 apt-one-jar io.github.openfeign.querydsl querydsl-mongodb - 7.5-SNAPSHOT + 7.4.0 apt diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index 9654d63dcc..66e6e9fcee 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.5-SNAPSHOT + 7.4.0 querydsl-examples diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index bf76b2ed6e..bb7501af56 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-jpa-guice diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 9e66766a85..877cadac4e 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-jpa-quarkus diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml index 14586f020f..70ece1b988 100755 --- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-spring/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-jpa-spring diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 602b548166..6fec026003 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-kotlin-codegen Querydsl example - Kotlin Codegen diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml index 2c54a6a88e..ab98e0df24 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-kotlin Querydsl example - Kotlin JPA diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml index 64be78137d..423f44049c 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-kotlin-mongodb Querydsl example - Kotlin MongoDB diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml index 7596589340..29ca310a44 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-r2dbc-sql-codegen diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml index 466fc12c02..0020bbf6d3 100644 --- a/querydsl-examples/querydsl-example-sql-guice/pom.xml +++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-sql-guice diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml index b32020d9ad..0291ced912 100644 --- a/querydsl-examples/querydsl-example-sql-spring/pom.xml +++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.5-SNAPSHOT + 7.4.0 querydsl-example-sql-spring diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index 5bbd59b8f7..32354b045f 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.5-SNAPSHOT + 7.4.0 querydsl-libraries diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml index 18bbb03b91..e0c6b4ed47 100644 --- a/querydsl-libraries/querydsl-collections/pom.xml +++ b/querydsl-libraries/querydsl-collections/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 io.github.openfeign.querydsl diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index 57a76aa89d..c744631612 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-core diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml index 57782e59e5..1a1f4c2ad5 100644 --- a/querydsl-libraries/querydsl-guava/pom.xml +++ b/querydsl-libraries/querydsl-guava/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-guava diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml index e6009bad05..d0c74ff0c6 100644 --- a/querydsl-libraries/querydsl-jpa-spring/pom.xml +++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-jpa-spring diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index 30b0a33af9..01b4044019 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-jpa diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml index ae69a361a8..57f00a3c2e 100644 --- a/querydsl-libraries/querydsl-kotlin/pom.xml +++ b/querydsl-libraries/querydsl-kotlin/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-kotlin diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml index accac185fa..31f952451f 100644 --- a/querydsl-libraries/querydsl-mongodb/pom.xml +++ b/querydsl-libraries/querydsl-mongodb/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-mongodb diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml index ad83f3c4cf..c67716923c 100644 --- a/querydsl-libraries/querydsl-r2dbc/pom.xml +++ b/querydsl-libraries/querydsl-r2dbc/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-r2dbc diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml index d6dadfad09..7260a264a8 100644 --- a/querydsl-libraries/querydsl-scala/pom.xml +++ b/querydsl-libraries/querydsl-scala/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-scala diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml index 432acb452a..9e1a9845f3 100644 --- a/querydsl-libraries/querydsl-spatial/pom.xml +++ b/querydsl-libraries/querydsl-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-spatial diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index 5cc8924a59..0abebd3265 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-sql-json diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index f57b45b322..836651d8a7 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-sql-spatial diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml index 0778d3adb0..55447c9a89 100644 --- a/querydsl-libraries/querydsl-sql-spring/pom.xml +++ b/querydsl-libraries/querydsl-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-sql-spring diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index 6ba4fb6095..b96b6ac9a7 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.5-SNAPSHOT + 7.4.0 querydsl-sql diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index 42beef718f..b14fd9b293 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.5-SNAPSHOT + 7.4.0 querydsl-tooling diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml index a16f8ba978..6dd0b4af64 100644 --- a/querydsl-tooling/querydsl-apt-test/pom.xml +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-apt-test diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index c5f261e2eb..52da0148ae 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-apt diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml index b537e8b167..fa17f77d90 100644 --- a/querydsl-tooling/querydsl-codegen-utils/pom.xml +++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml @@ -6,7 +6,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-codegen-utils diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml index 380be6015e..6b160fb341 100644 --- a/querydsl-tooling/querydsl-codegen/pom.xml +++ b/querydsl-tooling/querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-codegen diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml index 013a103932..e5322cddaf 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml +++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml index 0842d8edeb..f657047ba1 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml +++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-kotlin-codegen diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 638b418556..efcbde5ca9 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-ksp-codegen diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml index 5f055927f3..3659e4f6f5 100644 --- a/querydsl-tooling/querydsl-maven-plugin/pom.xml +++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-maven-plugin diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index 2492d0074e..1e2887f5b2 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.5-SNAPSHOT + 7.4.0 querydsl-sql-codegen From 5e099ef9494d13e353c19529ecd6b8d00dba2ded Mon Sep 17 00:00:00 2001 From: velo Date: Mon, 15 Jun 2026 11:25:46 -0300 Subject: [PATCH 51/62] [ci skip] updating versions to next development iteration 7.5-SNAPSHOT --- pom.xml | 2 +- querydsl-bom/pom.xml | 70 +++++++++---------- querydsl-examples/pom.xml | 2 +- .../querydsl-example-jpa-guice/pom.xml | 2 +- .../querydsl-example-jpa-quarkus/pom.xml | 2 +- .../querydsl-example-jpa-spring/pom.xml | 2 +- .../querydsl-example-kotlin-codegen/pom.xml | 2 +- .../querydsl-example-kotlin-jpa/pom.xml | 2 +- .../querydsl-example-kotlin-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../querydsl-example-sql-guice/pom.xml | 2 +- .../querydsl-example-sql-spring/pom.xml | 2 +- querydsl-libraries/pom.xml | 2 +- .../querydsl-collections/pom.xml | 2 +- querydsl-libraries/querydsl-core/pom.xml | 2 +- querydsl-libraries/querydsl-guava/pom.xml | 2 +- .../querydsl-jpa-spring/pom.xml | 2 +- querydsl-libraries/querydsl-jpa/pom.xml | 2 +- querydsl-libraries/querydsl-kotlin/pom.xml | 2 +- querydsl-libraries/querydsl-mongodb/pom.xml | 2 +- querydsl-libraries/querydsl-r2dbc/pom.xml | 2 +- querydsl-libraries/querydsl-scala/pom.xml | 2 +- querydsl-libraries/querydsl-spatial/pom.xml | 2 +- querydsl-libraries/querydsl-sql-json/pom.xml | 2 +- .../querydsl-sql-spatial/pom.xml | 2 +- .../querydsl-sql-spring/pom.xml | 2 +- querydsl-libraries/querydsl-sql/pom.xml | 2 +- querydsl-tooling/pom.xml | 2 +- querydsl-tooling/querydsl-apt-test/pom.xml | 2 +- querydsl-tooling/querydsl-apt/pom.xml | 2 +- .../querydsl-codegen-utils/pom.xml | 2 +- querydsl-tooling/querydsl-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-jpa-codegen/pom.xml | 2 +- .../querydsl-kotlin-codegen/pom.xml | 2 +- querydsl-tooling/querydsl-ksp-codegen/pom.xml | 2 +- .../querydsl-maven-plugin/pom.xml | 2 +- querydsl-tooling/querydsl-sql-codegen/pom.xml | 2 +- 37 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 4cb6abce5a..92dfd5c118 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT pom Querydsl diff --git a/querydsl-bom/pom.xml b/querydsl-bom/pom.xml index 3110f1382b..111edc234b 100644 --- a/querydsl-bom/pom.xml +++ b/querydsl-bom/pom.xml @@ -11,7 +11,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT ../pom.xml @@ -26,185 +26,185 @@ io.github.openfeign.querydsl querydsl-core - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen-utils - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-spatial - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-maven-plugin - 7.4.0 + 7.5-SNAPSHOT maven-plugin io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-jpa-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-ksp-codegen - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-guava - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-collections - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spatial - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-spring - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-sql-json - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-r2dbc - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-scala - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-kotlin - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT general io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT hibernate io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jakarta io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jdo io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT jpa io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT morphia io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT roo io.github.openfeign.querydsl querydsl-apt - 7.4.0 + 7.5-SNAPSHOT general-one io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt-hibernate-one-jar io.github.openfeign.querydsl querydsl-jpa - 7.4.0 + 7.5-SNAPSHOT apt io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT apt-one-jar io.github.openfeign.querydsl querydsl-mongodb - 7.4.0 + 7.5-SNAPSHOT apt diff --git a/querydsl-examples/pom.xml b/querydsl-examples/pom.xml index 66e6e9fcee..9654d63dcc 100644 --- a/querydsl-examples/pom.xml +++ b/querydsl-examples/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-examples diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml index bb7501af56..bf76b2ed6e 100644 --- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-guice diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 877cadac4e..9e66766a85 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-quarkus diff --git a/querydsl-examples/querydsl-example-jpa-spring/pom.xml b/querydsl-examples/querydsl-example-jpa-spring/pom.xml index 70ece1b988..14586f020f 100755 --- a/querydsl-examples/querydsl-example-jpa-spring/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-spring/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-jpa-spring diff --git a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml index 6fec026003..602b548166 100644 --- a/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin-codegen Querydsl example - Kotlin Codegen diff --git a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml index ab98e0df24..2c54a6a88e 100644 --- a/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-jpa/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin Querydsl example - Kotlin JPA diff --git a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml index 423f44049c..64be78137d 100644 --- a/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml +++ b/querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-kotlin-mongodb Querydsl example - Kotlin MongoDB diff --git a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml index 29ca310a44..7596589340 100644 --- a/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml +++ b/querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-r2dbc-sql-codegen diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml index 0020bbf6d3..466fc12c02 100644 --- a/querydsl-examples/querydsl-example-sql-guice/pom.xml +++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-sql-guice diff --git a/querydsl-examples/querydsl-example-sql-spring/pom.xml b/querydsl-examples/querydsl-example-sql-spring/pom.xml index 0291ced912..b32020d9ad 100644 --- a/querydsl-examples/querydsl-example-sql-spring/pom.xml +++ b/querydsl-examples/querydsl-example-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-examples - 7.4.0 + 7.5-SNAPSHOT querydsl-example-sql-spring diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index 32354b045f..5bbd59b8f7 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-libraries diff --git a/querydsl-libraries/querydsl-collections/pom.xml b/querydsl-libraries/querydsl-collections/pom.xml index e0c6b4ed47..18bbb03b91 100644 --- a/querydsl-libraries/querydsl-collections/pom.xml +++ b/querydsl-libraries/querydsl-collections/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT io.github.openfeign.querydsl diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index c744631612..57a76aa89d 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-core diff --git a/querydsl-libraries/querydsl-guava/pom.xml b/querydsl-libraries/querydsl-guava/pom.xml index 1a1f4c2ad5..57782e59e5 100644 --- a/querydsl-libraries/querydsl-guava/pom.xml +++ b/querydsl-libraries/querydsl-guava/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-guava diff --git a/querydsl-libraries/querydsl-jpa-spring/pom.xml b/querydsl-libraries/querydsl-jpa-spring/pom.xml index d0c74ff0c6..e6009bad05 100644 --- a/querydsl-libraries/querydsl-jpa-spring/pom.xml +++ b/querydsl-libraries/querydsl-jpa-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa-spring diff --git a/querydsl-libraries/querydsl-jpa/pom.xml b/querydsl-libraries/querydsl-jpa/pom.xml index 01b4044019..30b0a33af9 100644 --- a/querydsl-libraries/querydsl-jpa/pom.xml +++ b/querydsl-libraries/querydsl-jpa/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa diff --git a/querydsl-libraries/querydsl-kotlin/pom.xml b/querydsl-libraries/querydsl-kotlin/pom.xml index 57f00a3c2e..ae69a361a8 100644 --- a/querydsl-libraries/querydsl-kotlin/pom.xml +++ b/querydsl-libraries/querydsl-kotlin/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-kotlin diff --git a/querydsl-libraries/querydsl-mongodb/pom.xml b/querydsl-libraries/querydsl-mongodb/pom.xml index 31f952451f..accac185fa 100644 --- a/querydsl-libraries/querydsl-mongodb/pom.xml +++ b/querydsl-libraries/querydsl-mongodb/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-mongodb diff --git a/querydsl-libraries/querydsl-r2dbc/pom.xml b/querydsl-libraries/querydsl-r2dbc/pom.xml index c67716923c..ad83f3c4cf 100644 --- a/querydsl-libraries/querydsl-r2dbc/pom.xml +++ b/querydsl-libraries/querydsl-r2dbc/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-r2dbc diff --git a/querydsl-libraries/querydsl-scala/pom.xml b/querydsl-libraries/querydsl-scala/pom.xml index 7260a264a8..d6dadfad09 100644 --- a/querydsl-libraries/querydsl-scala/pom.xml +++ b/querydsl-libraries/querydsl-scala/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-scala diff --git a/querydsl-libraries/querydsl-spatial/pom.xml b/querydsl-libraries/querydsl-spatial/pom.xml index 9e1a9845f3..432acb452a 100644 --- a/querydsl-libraries/querydsl-spatial/pom.xml +++ b/querydsl-libraries/querydsl-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-spatial diff --git a/querydsl-libraries/querydsl-sql-json/pom.xml b/querydsl-libraries/querydsl-sql-json/pom.xml index 0abebd3265..5cc8924a59 100644 --- a/querydsl-libraries/querydsl-sql-json/pom.xml +++ b/querydsl-libraries/querydsl-sql-json/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-json diff --git a/querydsl-libraries/querydsl-sql-spatial/pom.xml b/querydsl-libraries/querydsl-sql-spatial/pom.xml index 836651d8a7..f57b45b322 100644 --- a/querydsl-libraries/querydsl-sql-spatial/pom.xml +++ b/querydsl-libraries/querydsl-sql-spatial/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-spatial diff --git a/querydsl-libraries/querydsl-sql-spring/pom.xml b/querydsl-libraries/querydsl-sql-spring/pom.xml index 55447c9a89..0778d3adb0 100644 --- a/querydsl-libraries/querydsl-sql-spring/pom.xml +++ b/querydsl-libraries/querydsl-sql-spring/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-spring diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index b96b6ac9a7..6ba4fb6095 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-libraries - 7.4.0 + 7.5-SNAPSHOT querydsl-sql diff --git a/querydsl-tooling/pom.xml b/querydsl-tooling/pom.xml index b14fd9b293..42beef718f 100644 --- a/querydsl-tooling/pom.xml +++ b/querydsl-tooling/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-root - 7.4.0 + 7.5-SNAPSHOT querydsl-tooling diff --git a/querydsl-tooling/querydsl-apt-test/pom.xml b/querydsl-tooling/querydsl-apt-test/pom.xml index 6dd0b4af64..a16f8ba978 100644 --- a/querydsl-tooling/querydsl-apt-test/pom.xml +++ b/querydsl-tooling/querydsl-apt-test/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-apt-test diff --git a/querydsl-tooling/querydsl-apt/pom.xml b/querydsl-tooling/querydsl-apt/pom.xml index 52da0148ae..c5f261e2eb 100644 --- a/querydsl-tooling/querydsl-apt/pom.xml +++ b/querydsl-tooling/querydsl-apt/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-apt diff --git a/querydsl-tooling/querydsl-codegen-utils/pom.xml b/querydsl-tooling/querydsl-codegen-utils/pom.xml index fa17f77d90..b537e8b167 100644 --- a/querydsl-tooling/querydsl-codegen-utils/pom.xml +++ b/querydsl-tooling/querydsl-codegen-utils/pom.xml @@ -6,7 +6,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-codegen-utils diff --git a/querydsl-tooling/querydsl-codegen/pom.xml b/querydsl-tooling/querydsl-codegen/pom.xml index 6b160fb341..380be6015e 100644 --- a/querydsl-tooling/querydsl-codegen/pom.xml +++ b/querydsl-tooling/querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-codegen diff --git a/querydsl-tooling/querydsl-jpa-codegen/pom.xml b/querydsl-tooling/querydsl-jpa-codegen/pom.xml index e5322cddaf..013a103932 100644 --- a/querydsl-tooling/querydsl-jpa-codegen/pom.xml +++ b/querydsl-tooling/querydsl-jpa-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-jpa-codegen diff --git a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml index f657047ba1..0842d8edeb 100644 --- a/querydsl-tooling/querydsl-kotlin-codegen/pom.xml +++ b/querydsl-tooling/querydsl-kotlin-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-kotlin-codegen diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index efcbde5ca9..638b418556 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -4,7 +4,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-ksp-codegen diff --git a/querydsl-tooling/querydsl-maven-plugin/pom.xml b/querydsl-tooling/querydsl-maven-plugin/pom.xml index 3659e4f6f5..5f055927f3 100644 --- a/querydsl-tooling/querydsl-maven-plugin/pom.xml +++ b/querydsl-tooling/querydsl-maven-plugin/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-maven-plugin diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index 1e2887f5b2..2492d0074e 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -5,7 +5,7 @@ io.github.openfeign.querydsl querydsl-tooling - 7.4.0 + 7.5-SNAPSHOT querydsl-sql-codegen From 555e2ca44f4d9feb483b64a6d812f4efe81a7d8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jun 2026 05:23:39 +0000 Subject: [PATCH 52/62] Build(deps-dev): Bump org.sonatype.central:central-publishing-maven-plugin Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.10.0 to 0.11.0. - [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits) --- updated-dependencies: - dependency-name: org.sonatype.central:central-publishing-maven-plugin dependency-version: 0.11.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92dfd5c118..8eed4fc24b 100644 --- a/pom.xml +++ b/pom.xml @@ -804,7 +804,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.10.0 + 0.11.0 true central From 89e289048a64ff0f75615dd700fb689628c664b0 Mon Sep 17 00:00:00 2001 From: mobpolice <125884492+mobpolice@users.noreply.github.com> Date: Wed, 17 Jun 2026 20:20:58 +0900 Subject: [PATCH 53/62] =?UTF-8?q?fix:=20ksp-codegen=20generates=20unqualif?= =?UTF-8?q?ied=20type=20reference=20for=20@EmbeddedId=E2=80=A6=20(#1806)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: ksp-codegen generates unqualified type reference for @EmbeddedId inner class Co-authored-by: ssb --- .../ksp/codegen/QueryModelExtractor.kt | 11 +++++- .../kotlin/KspProcessorIntegrationTest.kt | 37 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/querydsl-tooling/querydsl-ksp-codegen/src/main/kotlin/com/querydsl/ksp/codegen/QueryModelExtractor.kt b/querydsl-tooling/querydsl-ksp-codegen/src/main/kotlin/com/querydsl/ksp/codegen/QueryModelExtractor.kt index 7d3cacd43e..46dfb8ceef 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/src/main/kotlin/com/querydsl/ksp/codegen/QueryModelExtractor.kt +++ b/querydsl-tooling/querydsl-ksp-codegen/src/main/kotlin/com/querydsl/ksp/codegen/QueryModelExtractor.kt @@ -168,13 +168,22 @@ class QueryModelExtractor( } private fun toQueryModel(classDeclaration: KSClassDeclaration, type: QueryModelType, constructor: KSFunctionDeclaration?): QueryModel { + val simpleNames = generateSequence(classDeclaration) { it.parentDeclaration as? KSClassDeclaration } + .map { it.simpleName.asString() } + .toList() + .reversed() + return QueryModel( // Build the ClassName from raw KSP names to avoid kotlinpoet-ksp's // toClassName(), which invalidates KSP2 lifetime tokens (see // superclassOrNull above for the same workaround). + // Inner classes need the full parent hierarchy passed as vararg simple names + // so KotlinPoet emits a qualified reference (e.g. Outer.Inner) instead of + // the bare Inner, which fails to resolve at compile time. originalClassName = ClassName( classDeclaration.packageName.asString(), - classDeclaration.simpleName.asString() + simpleNames.first(), + *simpleNames.drop(1).toTypedArray() ), typeParameterCount = classDeclaration.typeParameters.size, className = queryClassName(classDeclaration, settings), diff --git a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt index 1f14378a54..130cfa6a9e 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt +++ b/querydsl-tooling/querydsl-ksp-codegen/src/test/kotlin/KspProcessorIntegrationTest.kt @@ -668,6 +668,43 @@ class KspProcessorIntegrationTest { return compilation.compile() to compilation.kspSourcesDir } + @Test + fun embeddableInnerClass_generatesQualifiedTypeReference() { + val source = SourceFile.kotlin( + "Invoice.kt", + """ + package test + + import jakarta.persistence.Embeddable + import jakarta.persistence.EmbeddedId + import jakarta.persistence.Entity + import java.io.Serializable + + @Entity + class Invoice( + @EmbeddedId val id: InvoiceId + ) { + @Embeddable + data class InvoiceId( + val invoiceNo: String = "", + val seq: Int = 0 + ) : Serializable + } + """.trimIndent() + ) + + val (result, generatedDir) = compile(source) + + assertThat(result.exitCode) + .withFailMessage(result.messages) + .isEqualTo(KotlinCompilation.ExitCode.OK) + + val qInvoiceId = generatedDir.findGenerated("QInvoice_InvoiceId.kt") + assertThat(qInvoiceId.readText()) + .contains("Invoice.InvoiceId") + .doesNotContain("EmbeddablePath") + } + private fun File.findGenerated(name: String): File { val match = walkTopDown().firstOrNull { it.isFile && it.name == name } assertThat(match) From 55849095cd0d0a82140d4467f36439897d0bf332 Mon Sep 17 00:00:00 2001 From: Kamil Krzywanski <61804231+kamilkrzywanski@users.noreply.github.com> Date: Wed, 17 Jun 2026 15:51:45 +0200 Subject: [PATCH 54/62] More clear approach to achevice correct classloader (#1804) More clear approach to achevice correct classloader (upgrade for commit fix #853 - repair classloader for spring (#870)) --- .../com/querydsl/codegen/utils/JDKEvaluatorFactory.java | 6 +----- .../java/com/querydsl/codegen/utils/SimpleCompiler.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java b/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java index 1b6cf2f7ea..cdc173db9c 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/JDKEvaluatorFactory.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Optional; import javax.tools.JavaCompiler; import javax.tools.SimpleJavaFileObject; import javax.tools.StandardLocation; @@ -51,10 +50,7 @@ public JDKEvaluatorFactory(ClassLoader parent, JavaCompiler compiler) { this.fileManager = new MemFileManager(parent, compiler.getStandardFileManager(null, null, null)); this.compiler = compiler; - this.classpath = - Optional.of(SimpleCompiler.getClassPath(parent)) - .filter(s -> !s.isEmpty()) - .orElseGet(() -> SimpleCompiler.getClassPath(compiler.getClass().getClassLoader())); + this.classpath = SimpleCompiler.getClassPath(parent); this.loader = fileManager.getClassLoader(StandardLocation.CLASS_OUTPUT); this.compilationOptions = Arrays.asList("-classpath", classpath, "-g:none"); } diff --git a/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java b/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java index c59052598c..28acdbadd2 100644 --- a/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java +++ b/querydsl-tooling/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java @@ -36,7 +36,7 @@ public class SimpleCompiler implements JavaCompiler { public static String getClassPath(ClassLoader cl) { - return new ClassGraph().overrideClassLoaders(cl).getClasspath(); + return new ClassGraph().addClassLoader(cl).getClasspath(); } private final ClassLoader classLoader; From 09d7e136ee6f86f96b678e94dc2414ba258706f2 Mon Sep 17 00:00:00 2001 From: Alexandre Potvin Latreille <903992+plalx@users.noreply.github.com> Date: Wed, 17 Jun 2026 09:57:49 -0400 Subject: [PATCH 55/62] Fix nondeterministic constant ordering causing possible incorrect in-memory evaluation (#1803) * Fix nondeterministic constant ordering causing incorrect in-memory evaluation Problem: `DefaultEvaluatorFactory` builds compiled evaluators with from a non-deterministic ordering of constants. This can lead to mismatches between the cached generated java method and the runtime argument order, producing incorrect evaluation results. `AbstractEvaluatorFactory#toId` only includes constant types in the cache key, not their values. This is safe only if argument ordering is stable, which is not guaranteed with the current constant resolution logic. For example, the predicate `QEntity.entity.prop1.eq(true).or(QEntity.entity.prop2.eq(false))` may result in a mismatch where the same compiled method is reused, but arguments are supplied in a different order. The method may be invoked with `[true, false]` (correct) or `[false, true]` (incorrect), leading to inverted semantics at evaluation time. Solution: This change ensures deterministic constant ordering so that compiled methods and runtime arguments always remain aligned. * Apply code formatting to DefaultEvaluatorFactory Signed-off-by: Marvin Froeder * Add regression test for deterministic constant ordering Signed-off-by: Marvin Froeder --------- Signed-off-by: Marvin Froeder Co-authored-by: Alexandre Potvin Latreille Co-authored-by: Marvin Froeder --- .../collections/DefaultEvaluatorFactory.java | 38 +++++----- .../DefaultEvaluatorFactoryTest.java | 72 +++++++++++++++++++ 2 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DefaultEvaluatorFactoryTest.java diff --git a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java index c759a0da3c..b6264b371a 100644 --- a/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java +++ b/querydsl-libraries/querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java @@ -37,7 +37,7 @@ import com.querydsl.core.util.PrimitiveUtils; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import javax.tools.JavaCompiler; @@ -112,8 +112,8 @@ public Evaluator create( } serializer.append(";"); - var constantToLabel = serializer.getConstantToLabel(); - var constants = getConstants(metadata, constantToLabel); + var constants = + getConstants(metadata, serializer.getConstants(), serializer.getConstantToLabel()); var types = new Class[sources.size()]; var names = new String[sources.size()]; for (var i = 0; i < sources.size(); i++) { @@ -155,8 +155,7 @@ public Evaluator> createEvaluator( ser.append("}\n"); ser.append("return rv;"); - var constantToLabel = ser.getConstantToLabel(); - var constants = getConstants(metadata, constantToLabel); + var constants = getConstants(metadata, ser.getConstants(), ser.getConstantToLabel()); Type sourceType = new ClassType(TypeCategory.SIMPLE, source.getType()); var sourceListType = new ClassType(TypeCategory.SIMPLE, Iterable.class, sourceType); @@ -269,8 +268,7 @@ public Evaluator> createEvaluator( } ser.append("return rv;"); - var constantToLabel = ser.getConstantToLabel(); - var constants = getConstants(metadata, constantToLabel); + var constants = getConstants(metadata, ser.getConstants(), ser.getConstantToLabel()); var projectionType = new ClassType(TypeCategory.LIST, List.class, Types.OBJECTS); return factory.createEvaluator( @@ -283,19 +281,25 @@ public Evaluator> createEvaluator( } private Map getConstants( - QueryMetadata metadata, Map constantToLabel) { - Map constants = new HashMap<>(); - for (Map.Entry entry : constantToLabel.entrySet()) { - if (entry.getKey() instanceof ParamExpression) { - var value = metadata.getParams().get(entry.getKey()); + QueryMetadata metadata, List constants, Map constantToLabel) { + var result = new LinkedHashMap(); + + for (var constant : constants) { + var paramName = constantToLabel.get(constant); + + if (constant instanceof ParamExpression) { + var value = metadata.getParams().get(constant); if (value == null) { - throw new ParamNotSetException((ParamExpression) entry.getKey()); + throw new ParamNotSetException((ParamExpression) constant); } - constants.put(entry.getValue(), value); - } else { - constants.put(entry.getValue(), entry.getKey()); + + result.put(paramName, value); + continue; } + + result.put(paramName, constant); } - return constants; + + return result; } } diff --git a/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DefaultEvaluatorFactoryTest.java b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DefaultEvaluatorFactoryTest.java new file mode 100644 index 0000000000..720bc8e2b8 --- /dev/null +++ b/querydsl-libraries/querydsl-collections/src/test/java/com/querydsl/collections/DefaultEvaluatorFactoryTest.java @@ -0,0 +1,72 @@ +package com.querydsl.collections; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.querydsl.codegen.utils.Evaluator; +import com.querydsl.codegen.utils.EvaluatorFactory; +import com.querydsl.codegen.utils.model.ClassType; +import com.querydsl.codegen.utils.model.Type; +import com.querydsl.core.DefaultQueryMetadata; +import com.querydsl.core.types.dsl.BooleanExpression; +import java.util.ArrayList; +import java.util.Map; +import org.junit.jupiter.api.Test; + +public class DefaultEvaluatorFactoryTest extends AbstractQueryTest { + + /** + * The compiled evaluator is cached by a key that does not encode constant ordering, and its + * arguments are supplied positionally. The factory must therefore emit constants in a + * deterministic order matching the AST traversal so that a cached method is always invoked with + * its arguments in the same positions it was compiled with. + */ + @Test + public void constants_follow_ast_order() { + var capturing = new CapturingEvaluatorFactory(); + var factory = new DefaultEvaluatorFactory(CollQueryTemplates.DEFAULT, capturing); + + BooleanExpression filter = cat.name.eq("c1"); + for (var i = 2; i <= 12; i++) { + filter = filter.or(cat.name.eq("c" + i)); + } + + factory.createEvaluator(new DefaultQueryMetadata(), cat, filter); + + var expectedKeys = new ArrayList(); + for (var i = 1; i <= 12; i++) { + expectedKeys.add("a" + i); + } + assertThat(capturing.constants.keySet()).containsExactlyElementsOf(expectedKeys); + for (var i = 1; i <= 12; i++) { + assertThat(capturing.constants.get("a" + i)).isEqualTo("c" + i); + } + } + + private static final class CapturingEvaluatorFactory implements EvaluatorFactory { + + private Map constants; + + @Override + public Evaluator createEvaluator( + String source, + Class projectionType, + String[] names, + Class[] classes, + Map constants) { + this.constants = constants; + return null; + } + + @Override + public Evaluator createEvaluator( + String source, + ClassType projection, + String[] names, + Type[] types, + Class[] classes, + Map constants) { + this.constants = constants; + return null; + } + } +} From c0abe0a7f36434061d22f0af6cf832dd740d73f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2026 05:23:10 +0000 Subject: [PATCH 56/62] Build(deps-dev): Bump org.openrewrite.maven:rewrite-maven-plugin Bumps [org.openrewrite.maven:rewrite-maven-plugin](https://github.com/openrewrite/rewrite-maven-plugin) from 6.41.0 to 6.42.0. - [Release notes](https://github.com/openrewrite/rewrite-maven-plugin/releases) - [Commits](https://github.com/openrewrite/rewrite-maven-plugin/compare/v6.41.0...v6.42.0) --- updated-dependencies: - dependency-name: org.openrewrite.maven:rewrite-maven-plugin dependency-version: 6.42.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eed4fc24b..ee4e827279 100644 --- a/pom.xml +++ b/pom.xml @@ -1057,7 +1057,7 @@ org.openrewrite.maven rewrite-maven-plugin - 6.41.0 + 6.42.0 From 7bff459ce052552d35426382db8e05d168dfbb0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2026 05:23:39 +0000 Subject: [PATCH 57/62] Build(deps): Bump org.openrewrite.recipe:rewrite-migrate-java Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.36.0 to 3.37.0. - [Release notes](https://github.com/openrewrite/rewrite-migrate-java/releases) - [Commits](https://github.com/openrewrite/rewrite-migrate-java/compare/v3.36.0...v3.37.0) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-migrate-java dependency-version: 3.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eed4fc24b..f6dc246809 100644 --- a/pom.xml +++ b/pom.xml @@ -1068,7 +1068,7 @@ org.openrewrite.recipe rewrite-migrate-java - 3.36.0 + 3.37.0 From e332bb68ebb5e0077917c2f4c890c2082c00719d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2026 05:24:32 +0000 Subject: [PATCH 58/62] Build(deps): Bump org.openrewrite.recipe:rewrite-testing-frameworks Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.37.0 to 3.38.0. - [Release notes](https://github.com/openrewrite/rewrite-testing-frameworks/releases) - [Commits](https://github.com/openrewrite/rewrite-testing-frameworks/compare/v3.37.0...v3.38.0) --- updated-dependencies: - dependency-name: org.openrewrite.recipe:rewrite-testing-frameworks dependency-version: 3.38.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eed4fc24b..e0e809cbe9 100644 --- a/pom.xml +++ b/pom.xml @@ -1063,7 +1063,7 @@ org.openrewrite.recipe rewrite-testing-frameworks - 3.37.0 + 3.38.0 org.openrewrite.recipe From 4603b41b2c84ad33ac4a101376bbd538eb874c1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 05:24:06 +0000 Subject: [PATCH 59/62] Build(deps): Bump quarkus.version from 3.36.2 to 3.36.3 Bumps `quarkus.version` from 3.36.2 to 3.36.3. Updates `io.quarkus.platform:quarkus-bom` from 3.36.2 to 3.36.3 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.2...3.36.3) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.36.2 to 3.36.3 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.36.2...3.36.3) --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-version: 3.36.3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-version: 3.36.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- querydsl-examples/querydsl-example-jpa-quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml index 9e66766a85..2fd29e3c77 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml +++ b/querydsl-examples/querydsl-example-jpa-quarkus/pom.xml @@ -12,7 +12,7 @@ Querydsl example - JPA Quarkus - 3.36.2 + 3.36.3 From 563fb9eff8a70100a6b64f5036658604425d3eb0 Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 21 Jun 2026 11:32:55 -0300 Subject: [PATCH 60/62] Add Turso (SQLite-compatible) database support (#1813) --- .circleci/config.yml | 2 +- pom.xml | 2 + querydsl-libraries/pom.xml | 1 + .../java/com/querydsl/core/FilterFactory.java | 1 + .../querydsl/core/MatchingFiltersFactory.java | 1 + .../test/java/com/querydsl/core/Target.java | 2 + .../com/querydsl/core/testutil/Turso.java | 17 ++ .../src/test/java/com/querydsl/jpa/Mode.java | 2 + querydsl-libraries/querydsl-sql/pom.xml | 7 + .../main/java/com/querydsl/sql/Keywords.java | 1 + .../querydsl/sql/SQLTemplatesRegistry.java | 2 + .../java/com/querydsl/sql/TursoTemplates.java | 166 ++++++++++++++++++ .../src/main/resources/keywords/turso | 146 +++++++++++++++ .../com/querydsl/sql/AbstractBaseTest.java | 17 ++ .../com/querydsl/sql/BeanPopulationBase.java | 4 + .../java/com/querydsl/sql/Connections.java | 78 ++++++++ .../com/querydsl/sql/DateArithmeticTest.java | 1 + .../java/com/querydsl/sql/DeleteBase.java | 11 +- .../java/com/querydsl/sql/InsertBase.java | 11 +- .../com/querydsl/sql/KeywordQuotingBase.java | 1 + .../test/java/com/querydsl/sql/MergeBase.java | 11 +- .../java/com/querydsl/sql/SelectBase.java | 80 +++++---- .../java/com/querydsl/sql/SubqueriesBase.java | 6 +- .../com/querydsl/sql/TursoTemplatesTest.java | 83 +++++++++ .../test/java/com/querydsl/sql/TypesBase.java | 3 +- .../java/com/querydsl/sql/UpdateBase.java | 10 ++ .../sql/suites/TursoLiteralsSuiteTest.java | 62 +++++++ .../querydsl/sql/suites/TursoSuiteTest.java | 61 +++++++ querydsl-tooling/querydsl-sql-codegen/pom.xml | 7 + .../querydsl/sql/codegen/ExportTursoTest.java | 18 ++ 30 files changed, 765 insertions(+), 49 deletions(-) create mode 100644 querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Turso.java create mode 100644 querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/TursoTemplates.java create mode 100644 querydsl-libraries/querydsl-sql/src/main/resources/keywords/turso create mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TursoTemplatesTest.java create mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoLiteralsSuiteTest.java create mode 100644 querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoSuiteTest.java create mode 100644 querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportTursoTest.java diff --git a/.circleci/config.yml b/.circleci/config.yml index c8cf69f262..3e15ab7c83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -341,7 +341,7 @@ jobs: - run: name: 'Test' command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase + ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase,com.querydsl.core.testutil.Turso - save-test-results testDB2: # Use the machine executor so we have full VM capabilities (e.g. docker running as admin) diff --git a/pom.xml b/pom.xml index 45ce55fe24..5d4b4575b4 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,7 @@ 13.4.0.jre11 9.3.9.0002 3.53.2.0 + 0.6.0 13.10.00.35 6.0.5 5.8.0 @@ -998,6 +999,7 @@ com.querydsl.core.testutil.Oracle, com.querydsl.core.testutil.PostgreSQL, com.querydsl.core.testutil.SQLite, + com.querydsl.core.testutil.Turso, com.querydsl.core.testutil.SQLServer, com.querydsl.core.testutil.SlowTest, com.querydsl.core.testutil.Performance, diff --git a/querydsl-libraries/pom.xml b/querydsl-libraries/pom.xml index 5bbd59b8f7..7dd7dc429f 100644 --- a/querydsl-libraries/pom.xml +++ b/querydsl-libraries/pom.xml @@ -124,6 +124,7 @@ cubrid:cubrid-jdbc:*:*:compile org.firebirdsql.jdbc:jaybird:*:*:compile org.xerial:sqlite-jdbc:*:*:compile + tech.turso:turso:*:*:compile org.hibernate:hibernate-entitymanager diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java index e52af3c415..ac6ce17da6 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/FilterFactory.java @@ -329,6 +329,7 @@ public Collection string( && !target.equals(Target.HSQLDB) && !target.equals(Target.H2) && !target.equals(Target.SQLITE) + && !target.equals(Target.TURSO) && !target.equals(Target.SQLSERVER)) { rv.add(expr.matches(knownValue.substring(0, 1) + ".*")); rv.add(expr.matches(".*" + knownValue.substring(1))); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java index 00155e6a9d..4d08ea32df 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/MatchingFiltersFactory.java @@ -272,6 +272,7 @@ public Collection string(StringExpression expr, StringExpression othe && !target.equals(Target.DB2) && !target.equals(Target.DERBY) && !target.equals(Target.SQLITE) + && !target.equals(Target.TURSO) && !target.equals(Target.SQLSERVER))) { rv.add(expr.matches(other)); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/Target.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/Target.java index 7aecc0d56f..316d6f88b2 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/Target.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/Target.java @@ -41,6 +41,8 @@ public enum Target { SQLSERVER, /** SQLite */ SQLITE, + /** Turso (SQLite-compatible) */ + TURSO, /** */ TERADATA, /** */ diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Turso.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Turso.java new file mode 100644 index 0000000000..5233ba7047 --- /dev/null +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/testutil/Turso.java @@ -0,0 +1,17 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.querydsl.core.testutil; + +public interface Turso extends EmbeddedDatabase {} diff --git a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java index 967658d13a..ee6624d920 100644 --- a/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java +++ b/querydsl-libraries/querydsl-jpa/src/test/java/com/querydsl/jpa/Mode.java @@ -12,6 +12,7 @@ import com.querydsl.sql.SQLTemplates; import com.querydsl.sql.SQLiteTemplates; import com.querydsl.sql.TeradataTemplates; +import com.querydsl.sql.TursoTemplates; /** * @author tiwe @@ -33,6 +34,7 @@ public static SQLTemplates getSQLTemplates() { case ORACLE -> new OracleTemplates(); case POSTGRESQL -> new PostgreSQLTemplates(); case SQLITE -> new SQLiteTemplates(); + case TURSO -> new TursoTemplates(); case TERADATA -> new TeradataTemplates(); default -> throw new IllegalStateException("Unknown mode " + mode); }; diff --git a/querydsl-libraries/querydsl-sql/pom.xml b/querydsl-libraries/querydsl-sql/pom.xml index 6ba4fb6095..7b9d6f4a9d 100644 --- a/querydsl-libraries/querydsl-sql/pom.xml +++ b/querydsl-libraries/querydsl-sql/pom.xml @@ -148,6 +148,13 @@ test + + tech.turso + turso + ${turso.version} + test + + io.github.openfeign.querydsl querydsl-core diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java index 1b9232219b..3cbace9ca9 100644 --- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java +++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/Keywords.java @@ -50,6 +50,7 @@ private static Set readLines(String path) { public static final Set ORACLE = readLines("oracle"); public static final Set POSTGRESQL = readLines("postgresql"); public static final Set SQLITE = readLines("sqlite"); + public static final Set TURSO = readLines("turso"); public static final Set SQLSERVER2005 = readLines("sqlserver2005"); public static final Set SQLSERVER2008 = readLines("sqlserver2008"); public static final Set SQLSERVER2012 = readLines("sqlserver2012"); diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java index 0514e4b32b..dc4fd2f326 100644 --- a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java +++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/SQLTemplatesRegistry.java @@ -58,6 +58,8 @@ public SQLTemplates.Builder getBuilder(DatabaseMetaData md) throws SQLException return PostgreSQLTemplates.builder(); } else if (name.equals("sqlite")) { return SQLiteTemplates.builder(); + } else if (name.equals("turso")) { + return TursoTemplates.builder(); } else if (name.startsWith("teradata")) { return TeradataTemplates.builder(); } else if (name.equals("microsoft sql server")) { diff --git a/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/TursoTemplates.java b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/TursoTemplates.java new file mode 100644 index 0000000000..ac95640768 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/main/java/com/querydsl/sql/TursoTemplates.java @@ -0,0 +1,166 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.sql; + +import com.querydsl.core.types.Ops; +import com.querydsl.sql.types.BigDecimalAsDoubleType; +import com.querydsl.sql.types.BigIntegerAsLongType; +import java.sql.Types; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoField; + +/** + * {@code TursoTemplates} is a SQL dialect for Turso (https://github.com/tursodatabase/turso), a + * SQLite-compatible database + * + * @author tiwe + */ +public class TursoTemplates extends SQLTemplates { + + private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + private static final DateTimeFormatter dateTimeFormatter = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + private static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + @SuppressWarnings("FieldNameHidesFieldInSuperclass") // Intentional + public static final TursoTemplates DEFAULT = new TursoTemplates(); + + public static Builder builder() { + return new Builder() { + @Override + protected SQLTemplates build(char escape, boolean quote) { + return new TursoTemplates(escape, quote); + } + }; + } + + public TursoTemplates() { + this('\\', false); + } + + public TursoTemplates(boolean quote) { + this('\\', quote); + } + + public TursoTemplates(char escape, boolean quote) { + super(Keywords.TURSO, "\"", escape, quote, false); + setDummyTable(null); + addCustomType(BigDecimalAsDoubleType.DEFAULT); + addCustomType(BigIntegerAsLongType.DEFAULT); + setUnionsWrapped(false); + setLimitRequired(true); + setNullsFirst(null); + setNullsLast(null); + setDefaultValues("\ndefault values"); + setArraysSupported(false); + setBatchToBulkSupported(false); + + setPrecedence(Precedence.COMPARISON - 1, Ops.LT, Ops.GT, Ops.LOE, Ops.GOE); + setPrecedence(Precedence.COMPARISON, Ops.EQ, Ops.EQ_IGNORE_CASE, Ops.NE); + + add(Ops.MOD, "{0} % {1}", Precedence.ARITH_HIGH); + + add(Ops.INDEX_OF, "charindex({1},{0},1)-1", Precedence.ARITH_LOW); + add(Ops.INDEX_OF_2ARGS, "charindex({1},{0},{2s}+1)-1", Precedence.ARITH_LOW); + + add(Ops.StringOps.LOCATE, "charindex({0},{1})"); + add(Ops.StringOps.LOCATE2, "charindex({0},{1},{2s})"); + + // TODO : optimize + add( + Ops.DateTimeOps.YEAR, + "cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.MONTH, + "cast(strftime('%m',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.WEEK, + "cast(strftime('%W',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1"); + add( + Ops.DateTimeOps.DAY_OF_MONTH, + "cast(strftime('%d',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.DAY_OF_WEEK, + "cast(strftime('%w',{0} / 1000, 'unixepoch', 'localtime') as integer) + 1"); + add( + Ops.DateTimeOps.DAY_OF_YEAR, + "cast(strftime('%j',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.HOUR, + "cast(strftime('%H',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.MINUTE, + "cast(strftime('%M',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + add( + Ops.DateTimeOps.SECOND, + "cast(strftime('%S',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + + add( + Ops.DateTimeOps.YEAR_MONTH, + """ + cast(strftime('%Y',{0} / 1000, 'unixepoch', 'localtime') * 100 + strftime('%m',{0} / 1000,\ + 'unixepoch', 'localtime') as integer)\ + """); + add( + Ops.DateTimeOps.YEAR_WEEK, + "cast(strftime('%Y%W',{0} / 1000, 'unixepoch', 'localtime') as integer)"); + + add(Ops.DateTimeOps.ADD_YEARS, "date({0}, '+{1s} year')"); + add(Ops.DateTimeOps.ADD_MONTHS, "date({0}, '+{1s} month')"); + add(Ops.DateTimeOps.ADD_WEEKS, "date({0}, '+{1s} week')"); + add(Ops.DateTimeOps.ADD_DAYS, "date({0}, '+{1s} day')"); + add(Ops.DateTimeOps.ADD_HOURS, "date({0}, '+{1s} hour')"); + add(Ops.DateTimeOps.ADD_MINUTES, "date({0}, '+{1s} minute')"); + add(Ops.DateTimeOps.ADD_SECONDS, "date({0}, '+{1s} second')"); + + add(Ops.MathOps.RANDOM, "random()"); + add(Ops.MathOps.RANDOM2, "random({0})"); + add(Ops.MathOps.LN, "log({0})"); + add(Ops.MathOps.LOG, "log({0}) / log({1})", Precedence.ARITH_HIGH); + + add(SQLOps.GROUP_CONCAT2, "group_concat({0},{1})"); + + addTypeNameToCode("text", Types.VARCHAR); + } + + @Override + public String serialize(String literal, int jdbcType) { + // XXX doesn't work with LocalDate, LocalDateTime and LocalTime + return switch (jdbcType) { + case Types.TIMESTAMP, TIMESTAMP_WITH_TIMEZONE -> + String.valueOf( + dateTimeFormatter + .parse(literal, LocalDateTime::from) + .toInstant(ZoneOffset.UTC) + .toEpochMilli()); + case Types.DATE -> + String.valueOf( + dateFormatter + .parse(literal, LocalDate::from) + .atStartOfDay(ZoneOffset.UTC) + .toInstant() + .toEpochMilli()); + case Types.TIME, TIME_WITH_TIMEZONE -> + String.valueOf( + timeFormatter.parse(literal, LocalTime::from).get(ChronoField.MILLI_OF_DAY)); + default -> super.serialize(literal, jdbcType); + }; + } +} diff --git a/querydsl-libraries/querydsl-sql/src/main/resources/keywords/turso b/querydsl-libraries/querydsl-sql/src/main/resources/keywords/turso new file mode 100644 index 0000000000..9eded2e9c9 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/main/resources/keywords/turso @@ -0,0 +1,146 @@ +# source https://github.com/tursodatabase/turso (SQLite-compatible) +ABORT +ACTION +ADD +AFTER +ALL +ALTER +ALWAYS +ANALYZE +AND +AS +ASC +ATTACH +AUTOINCREMENT +BEFORE +BEGIN +BETWEEN +BY +CASCADE +CASE +CAST +CHECK +COLLATE +COLUMN +COMMIT +CONFLICT +CONSTRAINT +CREATE +CROSS +CURRENT +CURRENT_DATE +CURRENT_TIME +CURRENT_TIMESTAMP +DATABASE +DEFAULT +DEFERRABLE +DEFERRED +DELETE +DESC +DETACH +DISTINCT +DO +DROP +EACH +ELSE +END +ESCAPE +EXCEPT +EXCLUSIVE +EXISTS +EXPLAIN +FAIL +FILTER +FIRST +FOLLOWING +FOR +FOREIGN +FROM +FULL +GENERATED +GLOB +GROUP +GROUPS +HAVING +IF +IGNORE +IMMEDIATE +IN +INDEX +INDEXED +INITIALLY +INNER +INSERT +INSTEAD +INTERSECT +INTO +IS +ISNULL +JOIN +KEY +LAST +LEFT +LIKE +LIMIT +MATCH +MATERIALIZED +NATURAL +NO +NOT +NOTHING +NOTNULL +NULL +NULLS +OF +OFFSET +ON +OR +ORDER +OTHERS +OUTER +OVER +PARTITION +PLAN +PRAGMA +PRECEDING +PRIMARY +QUERY +RAISE +RECURSIVE +REFERENCES +REGEXP +REINDEX +RELEASE +RENAME +REPLACE +RESTRICT +RETURNING +RIGHT +ROLLBACK +ROW +ROWS +SAVEPOINT +SELECT +SET +TABLE +TEMP +TEMPORARY +THEN +TIES +TO +TRANSACTION +TRIGGER +UNBOUNDED +UNION +UNIQUE +UPDATE +USING +VACUUM +VALUES +VIEW +VIRTUAL +WHEN +WHERE +WINDOW +WITH +WITHOUT diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java index 0246544972..80644dc134 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/AbstractBaseTest.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.logging.Logger; import org.jetbrains.annotations.Nullable; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith({TargetExtension.class, SkipForQuotedExtension.class}) @@ -84,6 +85,22 @@ public AbstractBaseTest() { } } + // Turso (early-stage SQLite reimplementation) closes the shared connection when a statement + // errors, which would otherwise cascade "database connection closed" across every later test. + // Reconnecting per test isolates each test so we see its true pass/fail result. + @BeforeEach + public void reconnectClosedTursoConnection() throws java.sql.SQLException { + if (target == Target.TURSO && (connection == null || connection.isClosed())) { + try { + Connections.initTurso(); + } catch (ClassNotFoundException e) { + throw new IllegalStateException(e); + } + connection = Connections.getConnection(); + configuration = Connections.getConfiguration(); + } + } + protected void add(List list, T arg, Target... exclusions) { if (exclusions.length > 0) { for (Target t : exclusions) { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java index 2e206882f8..f324a1601e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/BeanPopulationBase.java @@ -21,6 +21,7 @@ import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.testutil.ExcludeIn; @@ -40,6 +41,7 @@ public void tearDown() { delete(e).where(e.firstname.eq("John")).execute(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void custom_projection() { // Insert @@ -87,6 +89,7 @@ public void custom_projection() { assertThat(delete(e).where(e.id.eq(employee.getId())).execute()).isEqualTo(1L); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void insert_update_query_and_delete() { // Insert @@ -109,6 +112,7 @@ public void insert_update_query_and_delete() { assertThat(delete(e).where(e.id.eq(employee.getId())).execute()).isEqualTo(1L); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void populate_with_beanMapper() { var employee = new Employee(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java index 5dfc844e90..d8e0f73275 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/Connections.java @@ -75,6 +75,7 @@ public final class Connections { oracleInited, postgresqlInited, sqliteInited, + tursoInited, teradataInited, firebirdInited; @@ -170,6 +171,11 @@ private static Connection getSQLite() throws SQLException, ClassNotFoundExceptio return DriverManager.getConnection("jdbc:sqlite:target/sample.db"); } + private static Connection getTurso() throws SQLException, ClassNotFoundException { + Class.forName("tech.turso.JDBC"); + return DriverManager.getConnection("jdbc:turso:target/turso-sample.db"); + } + private static Connection getTeradata() throws SQLException, ClassNotFoundException { Class.forName("com.teradata.jdbc.TeraDriver"); return DriverManager.getConnection("jdbc:teradata://teradata/dbc", "querydsl", "querydsl"); @@ -1107,6 +1113,78 @@ CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) \ sqliteInited = true; } + public static void initTurso() throws SQLException, ClassNotFoundException { + targetHolder.set(Target.TURSO); + var c = getTurso(); + connHolder.set(c); + var stmt = c.createStatement(); + stmtHolder.set(stmt); + + if (tursoInited) { + return; + } + + // qtest + stmt.execute("drop table if exists QTEST"); + stmt.execute("create table QTEST (ID int IDENTITY(1,1) NOT NULL, C1 int NULL)"); + + // survey + stmt.execute("drop table if exists SURVEY"); + stmt.execute( + """ + create table SURVEY(ID int auto_increment, \ + NAME varchar(30),\ + NAME2 varchar(30),\ + constraint survey_pk primary key(ID))\ + """); + stmt.execute("insert into SURVEY values (1,'Hello World','Hello');"); + + // test + stmt.execute("drop table if exists TEST"); + stmt.execute(CREATE_TABLE_TEST); + try (var pstmt = c.prepareStatement(INSERT_INTO_TEST_VALUES)) { + for (var i = 0; i < TEST_ROW_COUNT; i++) { + pstmt.setString(1, "name" + i); + pstmt.addBatch(); + } + pstmt.executeBatch(); + } + + // employee + stmt.execute("drop table if exists EMPLOYEE"); + stmt.execute( + """ + create table EMPLOYEE ( \ + ID INT AUTO_INCREMENT, \ + FIRSTNAME VARCHAR(50), \ + LASTNAME VARCHAR(50), \ + SALARY DECIMAL, \ + DATEFIELD DATE, \ + TIMEFIELD TIME, \ + SUPERIOR_ID INT, \ + CONSTRAINT PK_EMPLOYEE PRIMARY KEY(ID),\ + CONSTRAINT FK_SUPERIOR FOREIGN KEY(SUPERIOR_ID) REFERENCES EMPLOYEE(ID) \ + )\ + """); + addEmployees(INSERT_INTO_EMPLOYEE); + + // date_test and time_test + stmt.execute("drop table if exists TIME_TEST"); + stmt.execute("drop table if exists DATE_TEST"); + stmt.execute(CREATE_TABLE_TIMETEST); + stmt.execute(CREATE_TABLE_DATETEST); + + // numbers + stmt.execute("drop table if exists NUMBER_TEST"); + stmt.execute("create table NUMBER_TEST(col1 integer)"); + + // xml + stmt.execute("drop table if exists XML_TEST"); + stmt.execute("create table XML_TEST(COL varchar(128))"); + + tursoInited = true; + } + public static void initSQLServer() throws SQLException, ClassNotFoundException { targetHolder.set(Target.SQLSERVER); SQLTemplates templates = new SQLServerTemplates(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java index 5e892f0ff3..9358d61d77 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DateArithmeticTest.java @@ -29,6 +29,7 @@ public void test() { list.add(new OracleTemplates()); list.add(new PostgreSQLTemplates()); list.add(new SQLiteTemplates()); + list.add(new TursoTemplates()); list.add(new SQLServerTemplates()); list.add(new SQLServer2005Templates()); list.add(new SQLServer2012Templates()); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java index da50efd59e..bc317b5b03 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/DeleteBase.java @@ -20,6 +20,7 @@ import static com.querydsl.core.Target.ORACLE; import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.survey; import static org.assertj.core.api.Assertions.assertThat; @@ -51,6 +52,7 @@ public void tearDown() throws SQLException { reset(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void batch() throws SQLException { insert(survey).values(2, "A", "B").execute(); @@ -65,7 +67,7 @@ public void batch() throws SQLException { } @Test - @ExcludeIn({CUBRID, SQLITE, FIREBIRD}) + @ExcludeIn({CUBRID, SQLITE, FIREBIRD, TURSO}) public void batch_templates() throws SQLException { insert(survey).values(2, "A", "B").execute(); insert(survey).values(3, "B", "C").execute(); @@ -77,7 +79,7 @@ public void batch_templates() throws SQLException { } @Test - @ExcludeIn(MYSQL) + @ExcludeIn({MYSQL, TURSO}) public void delete() throws SQLException { var count = query().from(survey).fetchCount(); assertThat(delete(survey).where(survey.name.eq("XXX")).execute()).isEqualTo(0); @@ -94,6 +96,7 @@ public void delete_limit() { assertThat(delete(survey).limit(2).execute()).isEqualTo(2); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void delete_with_subQuery_exists() { var survey1 = new QSurvey("s1"); @@ -104,6 +107,7 @@ public void delete_with_subQuery_exists() { assertThat(delete.execute()).isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void delete_with_subQuery_exists_Params() { var survey1 = new QSurvey("s1"); @@ -118,6 +122,7 @@ public void delete_with_subQuery_exists_Params() { assertThat(delete.execute()).isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void delete_with_subQuery_exists2() { var survey1 = new QSurvey("s1"); @@ -130,7 +135,7 @@ public void delete_with_subQuery_exists2() { } @Test - @ExcludeIn({CUBRID, SQLITE, FIREBIRD}) + @ExcludeIn({CUBRID, SQLITE, FIREBIRD, TURSO}) public void delete_with_tempateExpression_in_batch() { assertThat( delete(survey) diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java index eac6a9fca0..b4c7539a79 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/InsertBase.java @@ -24,6 +24,7 @@ import static com.querydsl.core.Target.POSTGRESQL; import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.survey; import static com.querydsl.sql.Constants.survey2; import static com.querydsl.sql.SQLExpressions.select; @@ -78,7 +79,7 @@ public void tearDown() throws SQLException { @Test @ExcludeIn({ - CUBRID, SQLITE, DERBY, ORACLE + CUBRID, SQLITE, DERBY, ORACLE, TURSO }) // https://bitbucket.org/xerial/sqlite-jdbc/issue/133/prepstmtsetdate-int-date-calendar-seems public void insert_dates() { var dateTest = QDateTest.qDateTest; @@ -256,7 +257,7 @@ public void insert_with_columns() { } @Test - @ExcludeIn({CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({CUBRID, SQLSERVER, SQLITE, TURSO}) public void insert_with_keys() throws SQLException { var rs = insert(survey).set(survey.name, "Hello World").executeWithKeys(); assertThat(rs.next()).isTrue(); @@ -265,7 +266,7 @@ public void insert_with_keys() throws SQLException { } @Test - @ExcludeIn({CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({CUBRID, SQLSERVER, SQLITE, TURSO}) public void insert_with_keys_listener() throws SQLException { final var result = new AtomicBoolean(); SQLListener listener = @@ -286,13 +287,13 @@ public void end(SQLListenerContext context) { } @Test - @ExcludeIn({CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({CUBRID, SQLSERVER, SQLITE, TURSO}) public void insert_with_keys_Projected() throws SQLException { assertThat(insert(survey).set(survey.name, "Hello you").executeWithKey(survey.id)).isNotNull(); } @Test - @ExcludeIn({CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({CUBRID, SQLSERVER, SQLITE, TURSO}) public void insert_with_keys_Projected2() throws SQLException { Path idPath = ExpressionUtils.path(Object.class, "id"); Object id = insert(survey).set(survey.name, "Hello you").executeWithKey(idPath); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java index 94220ef73a..0b9a94ad4c 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java @@ -101,6 +101,7 @@ public void validateKeywordsCompleteness() throws SQLException { case ORACLE -> Keywords.ORACLE; case POSTGRESQL -> Keywords.POSTGRESQL; case SQLITE -> Keywords.SQLITE; + case TURSO -> Keywords.TURSO; case SQLSERVER -> Keywords.SQLSERVER2012; case TERADATA -> Keywords.DEFAULT; }; diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java index b613745dde..6bc85f396e 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/MergeBase.java @@ -21,6 +21,7 @@ import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.survey; import static com.querydsl.sql.Constants.survey2; import static org.assertj.core.api.Assertions.assertThat; @@ -56,7 +57,7 @@ public void tearDown() throws SQLException { } @Test - @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE, TURSO}) public void merge_with_keys() throws SQLException { var rs = merge(survey) @@ -70,7 +71,7 @@ public void merge_with_keys() throws SQLException { } @Test - @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE, TURSO}) public void merge_with_keys_listener() throws SQLException { final var result = new AtomicBoolean(); SQLListener listener = @@ -139,7 +140,7 @@ public void merge_with_keys_columns_and_values_using_null() { } @Test - @ExcludeIn({CUBRID, DB2, DERBY, POSTGRESQL, SQLSERVER, TERADATA, SQLITE}) + @ExcludeIn({CUBRID, DB2, DERBY, POSTGRESQL, SQLSERVER, TERADATA, SQLITE, TURSO}) public void merge_with_keys_Null_Id() throws SQLException { var rs = merge(survey) @@ -153,7 +154,7 @@ public void merge_with_keys_Null_Id() throws SQLException { } @Test - @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE, TURSO}) public void merge_with_keys_Projected() throws SQLException { assertThat( merge(survey) @@ -165,7 +166,7 @@ public void merge_with_keys_Projected() throws SQLException { } @Test - @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE}) + @ExcludeIn({H2, CUBRID, SQLSERVER, SQLITE, TURSO}) public void merge_with_keys_Projected2() throws SQLException { Path idPath = ExpressionUtils.path(Object.class, "id"); Object id = diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java index 1773e4f329..ff4cf44f6d 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -26,6 +26,7 @@ import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.date; import static com.querydsl.sql.Constants.employee; import static com.querydsl.sql.Constants.employee2; @@ -130,6 +131,7 @@ private Tuple firstResult(Expression... exprs) { return query().select(exprs).fetchFirst(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void aggregate_list() { int min = 30000, avg = 65000, max = 160000; @@ -142,6 +144,7 @@ public void aggregate_list() { .isEqualTo(max); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void aggregate_uniqueResult() { int min = 30000, avg = 65000, max = 160000; @@ -214,6 +217,7 @@ private void arithmeticTests( assertThat(firstResult(four.divide(two.multiply(two))).intValue()).isEqualTo(1); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void arithmetic() { NumberExpression one = Expressions.numberTemplate(Integer.class, "(1.0)"); @@ -289,6 +293,7 @@ public void array_projection() { } } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void beans() { var rows = query().from(employee, employee2).select(new QBeans(employee, employee2)).fetch(); @@ -313,7 +318,7 @@ public void between() { } @Test - @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA}) + @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA, TURSO}) public void boolean_all() { assertThat( query() @@ -324,7 +329,7 @@ public void boolean_all() { } @Test - @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA}) + @ExcludeIn({ORACLE, CUBRID, FIREBIRD, DB2, DERBY, SQLSERVER, SQLITE, TERADATA, TURSO}) public void boolean_any() { assertThat( query() @@ -415,6 +420,7 @@ public void complex_boolean() { .isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void complex_subQuery() { // alias for the salary @@ -533,7 +539,7 @@ public void custom_projection() { } @Test - @ExcludeIn({CUBRID, DB2, DERBY, HSQLDB, POSTGRESQL, SQLITE, TERADATA, H2, FIREBIRD}) + @ExcludeIn({CUBRID, DB2, DERBY, HSQLDB, POSTGRESQL, SQLITE, TERADATA, H2, FIREBIRD, TURSO}) public void dates() throws SQLException { if (!configuration.getUseLiterals()) { dates(false); @@ -541,7 +547,7 @@ public void dates() throws SQLException { } @Test - @ExcludeIn({CUBRID, DB2, DERBY, SQLITE, TERADATA, FIREBIRD}) + @ExcludeIn({CUBRID, DB2, DERBY, SQLITE, TERADATA, FIREBIRD, TURSO}) public void dates_literals() throws SQLException { if (configuration.getUseLiterals()) { dates(true); @@ -647,7 +653,7 @@ private void dates(boolean literals) throws SQLException { } @Test - @ExcludeIn({SQLITE}) + @ExcludeIn({SQLITE, TURSO}) public void date_add() { SQLQuery query = query().from(employee); var date1 = query.select(employee.datefield).fetchFirst(); @@ -661,7 +667,7 @@ public void date_add() { } @Test - @ExcludeIn({SQLITE}) + @ExcludeIn({SQLITE, TURSO}) public void date_add_Timestamp() { List> exprs = new ArrayList<>(); var dt = Expressions.currentTimestamp(); @@ -679,7 +685,7 @@ public void date_add_Timestamp() { } @Test - @ExcludeIn({DB2, SQLITE, TERADATA}) + @ExcludeIn({DB2, SQLITE, TERADATA, TURSO}) public void date_diff() { var employee2 = new QEmployee("employee2"); SQLQuery query = query().from(employee).orderBy(employee.id.asc()); @@ -720,7 +726,7 @@ public void date_diff() { // TDO Date_diff with timestamps @Test - @ExcludeIn({DB2, HSQLDB, SQLITE, TERADATA, ORACLE}) + @ExcludeIn({DB2, HSQLDB, SQLITE, TERADATA, ORACLE, TURSO}) public void date_diff2() { SQLQuery query = query().from(employee).orderBy(employee.id.asc()); @@ -757,7 +763,7 @@ public void date_diff2() { } @Test - @ExcludeIn({SQLITE, H2}) // FIXME + @ExcludeIn({SQLITE, H2, TURSO}) // FIXME public void date_trunc() { var expr = DateTimeExpression.currentTimestamp(); @@ -776,7 +782,7 @@ public void date_trunc() { } @Test - @ExcludeIn({SQLITE, TERADATA, DERBY, H2}) // FIXME + @ExcludeIn({SQLITE, TERADATA, DERBY, H2, TURSO}) // FIXME public void date_trunc2() { DateTimeExpression expr = DateTimeExpression.currentTimestamp(LocalDateTime.class); @@ -854,6 +860,7 @@ public void date_trunc2() { assertThat(toSecond.getSecond()).isEqualTo(date.getSecond()); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void dateTime() { SQLQuery query = query().from(employee).orderBy(employee.id.asc()); @@ -867,7 +874,7 @@ public void dateTime() { } @Test - @ExcludeIn({SQLITE}) + @ExcludeIn({SQLITE, TURSO}) public void dateTime_to_date() { firstResult(SQLExpressions.date(DateTimeExpression.currentTimestamp())); } @@ -920,7 +927,7 @@ public void factoryExpression_in_groupBy() { } @Test - @ExcludeIn({H2, SQLITE, DERBY, CUBRID, MYSQL}) + @ExcludeIn({H2, SQLITE, DERBY, CUBRID, MYSQL, TURSO}) public void full_join() throws SQLException { assertThat( query() @@ -990,7 +997,7 @@ public void groupBy_yearMonth() { } @Test - @ExcludeIn({H2, DB2, DERBY, ORACLE, SQLSERVER}) + @ExcludeIn({H2, DB2, DERBY, ORACLE, SQLSERVER, TURSO}) public void groupBy_validate() { NumberPath alias = Expressions.numberPath(BigDecimal.class, "alias"); assertThat( @@ -1061,6 +1068,7 @@ public void illegalUnion() throws SQLException { }); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void in() { assertThat( @@ -1255,6 +1263,7 @@ public void limit_and_offset() throws SQLException { .isEqualTo(Arrays.asList(20, 13, 10, 2)); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void limit_and_offset_Group() { assertThat( @@ -1377,6 +1386,7 @@ public void listResults2() { assertThat(results.getTotal()).isEqualTo(10); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void listResults_factoryExpression() { var results = @@ -1419,7 +1429,7 @@ private double log(double x, int y) { } @Test - @ExcludeIn({SQLITE, DERBY}) + @ExcludeIn({SQLITE, DERBY, TURSO}) public void lPad() { assertThat(firstResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4))).isEqualTo(" ab"); assertThat(firstResult(StringExpressions.lpad(ConstantImpl.create("ab"), 4, '!'))) @@ -1459,13 +1469,13 @@ protected Pair map(Tuple row) { } @Test - @ExcludeIn({HSQLDB, SQLITE}) // FIXME + @ExcludeIn({HSQLDB, SQLITE, TURSO}) // FIXME public void math() { math(Expressions.numberTemplate(Double.class, "0.50")); } @Test - @ExcludeIn({FIREBIRD, SQLSERVER, HSQLDB, SQLITE}) // FIXME + @ExcludeIn({FIREBIRD, SQLSERVER, HSQLDB, SQLITE, TURSO}) // FIXME public void math2() { math(Expressions.constant(0.5)); } @@ -1536,7 +1546,7 @@ public void nested_tuple_projection() { } @Test - @ExcludeIn({SQLITE}) + @ExcludeIn({SQLITE, TURSO}) public void no_from() { assertThat(firstResult(DateExpression.currentDate())).isNotNull(); } @@ -1691,7 +1701,7 @@ public void params_not_set() { } @Test - @ExcludeIn({DB2, DERBY, FIREBIRD, HSQLDB, ORACLE, SQLSERVER}) + @ExcludeIn({DB2, DERBY, FIREBIRD, HSQLDB, ORACLE, SQLSERVER, TURSO}) @SkipForQuoted public void path_alias() { expectedQuery = @@ -1824,17 +1834,19 @@ private double radians(double x) { return x * Math.PI / 180.0; } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void random() { firstResult(MathExpressions.random()); } @Test - @ExcludeIn({FIREBIRD, ORACLE, POSTGRESQL, SQLITE, TERADATA}) + @ExcludeIn({FIREBIRD, ORACLE, POSTGRESQL, SQLITE, TERADATA, TURSO}) public void random2() { firstResult(MathExpressions.random(10)); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void relationalPath_projection() { var results = @@ -1918,7 +1930,7 @@ public void round() { } @Test - @ExcludeIn({SQLITE, DERBY}) + @ExcludeIn({SQLITE, DERBY, TURSO}) public void rpad() { assertThat(firstResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4))).isEqualTo("ab "); assertThat(firstResult(StringExpressions.rpad(ConstantImpl.create("ab"), 4, '!'))) @@ -1957,13 +1969,13 @@ public void select_concat() throws SQLException { } @Test - @ExcludeIn({SQLITE, CUBRID, TERADATA}) + @ExcludeIn({SQLITE, CUBRID, TERADATA, TURSO}) public void select_for_update() { assertThat(query().from(survey).forUpdate().select(survey.id).fetch()).hasSize(1); } @Test - @ExcludeIn({SQLITE, CUBRID, TERADATA}) + @ExcludeIn({SQLITE, CUBRID, TERADATA, TURSO}) public void select_for_update_Where() { assertThat( query().from(survey).forUpdate().where(survey.id.isNotNull()).select(survey.id).fetch()) @@ -1971,7 +1983,7 @@ public void select_for_update_Where() { } @Test - @ExcludeIn({SQLITE, CUBRID, TERADATA}) + @ExcludeIn({SQLITE, CUBRID, TERADATA, TURSO}) public void select_for_update_UniqueResult() { query().from(survey).forUpdate().select(survey.id).fetchOne(); } @@ -2063,6 +2075,7 @@ public void specialChars() { .isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void standardTest() { standardTest.runBooleanTests(employee.firstname.isNull(), employee2.lastname.isNotNull()); @@ -2077,7 +2090,7 @@ public void standardTest() { standardTest.runStringTests(employee.firstname, employee2.firstname, "Jennifer"); var target = Connections.getTarget(); - if (target != SQLITE) { + if (target != SQLITE && target != TURSO) { standardTest.runTimeTests(employee.timefield, employee2.timefield, time); } @@ -2097,7 +2110,7 @@ public void standardTest_turkish() { } @Test - @ExcludeIn(SQLITE) + @ExcludeIn({SQLITE, TURSO}) public void string() { StringExpression str = Expressions.stringTemplate("' abcd '"); @@ -2110,7 +2123,7 @@ public void string() { } @Test - @ExcludeIn(SQLITE) + @ExcludeIn({SQLITE, TURSO}) public void string_withTemplate() { StringExpression str = Expressions.stringTemplate("' abcd '"); @@ -2127,7 +2140,7 @@ public void string_withTemplate() { } @Test - @ExcludeIn({POSTGRESQL, SQLITE}) + @ExcludeIn({POSTGRESQL, SQLITE, TURSO}) public void string_indexOf() { StringExpression str = Expressions.stringTemplate("' abcd '"); @@ -2149,7 +2162,7 @@ public void stringFunctions2() throws SQLException { } @Test - @ExcludeIn(SQLITE) + @ExcludeIn({SQLITE, TURSO}) public void string_left() { assertThat( query() @@ -2161,7 +2174,7 @@ public void string_left() { } @Test - @ExcludeIn({DERBY, SQLITE}) + @ExcludeIn({DERBY, SQLITE, TURSO}) public void string_right() { assertThat( query() @@ -2173,7 +2186,7 @@ public void string_right() { } @Test - @ExcludeIn({DERBY, SQLITE}) + @ExcludeIn({DERBY, SQLITE, TURSO}) public void string_left_Right() { assertThat( query() @@ -2185,7 +2198,7 @@ public void string_left_Right() { } @Test - @ExcludeIn({DERBY, SQLITE}) + @ExcludeIn({DERBY, SQLITE, TURSO}) public void string_right_Left() { assertThat( query() @@ -2246,6 +2259,7 @@ public void templateExpression() { .isEqualTo(Collections.singletonList(1)); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void transform_groupBy() { var employee = new QEmployee("employee"); @@ -2334,6 +2348,7 @@ public void unique_wildcard() { assertThat(row.get(1, Object.class)).as(row.get(0, Object.class) + " is not null").isNotNull(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void uniqueResultContract() { assertThrows( @@ -2541,7 +2556,7 @@ public void withinGroup() { } @Test - @ExcludeIn({DB2, DERBY, H2}) + @ExcludeIn({DB2, DERBY, H2, TURSO}) public void yearWeek() { SQLQuery query = query().from(employee).orderBy(employee.id.asc()); assertThat(query.select(employee.datefield.yearWeek()).fetchFirst()) @@ -2556,6 +2571,7 @@ public void yearWeek_h2() { .isEqualTo(Integer.valueOf(200007)); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void statementOptions() { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java index aa2eb718db..2e3a7f6fbd 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SubqueriesBase.java @@ -11,6 +11,7 @@ import static com.querydsl.core.Target.SQLITE; import static com.querydsl.core.Target.SQLSERVER; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.employee; import static com.querydsl.sql.Constants.employee2; import static com.querydsl.sql.Constants.survey; @@ -89,6 +90,7 @@ public void subQueries() throws SQLException { assertThat(list).isNotEmpty(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void subQuery_alias() { query() @@ -98,7 +100,7 @@ public void subQuery_alias() { } @Test - @ExcludeIn(SQLITE) + @ExcludeIn({SQLITE, TURSO}) public void subQuery_all() { query() .from(employee) @@ -107,7 +109,7 @@ public void subQuery_all() { } @Test - @ExcludeIn(SQLITE) + @ExcludeIn({SQLITE, TURSO}) public void subQuery_any() { query() .from(employee) diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TursoTemplatesTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TursoTemplatesTest.java new file mode 100644 index 0000000000..8a839525f6 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TursoTemplatesTest.java @@ -0,0 +1,83 @@ +/* + * Copyright 2015, The Querydsl Team (http://www.querydsl.com/team) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.querydsl.sql; + +import static com.querydsl.sql.SQLExpressions.select; +import static org.assertj.core.api.Assertions.assertThat; + +import com.querydsl.core.types.Ops; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.Expressions; +import org.junit.jupiter.api.Test; + +public class TursoTemplatesTest extends AbstractSQLTemplatesTest { + + @Override + protected SQLTemplates createTemplates() { + return new TursoTemplates(); + } + + @SuppressWarnings("unchecked") + @Test + @Override + public void union() { + var one = Expressions.ONE; + var two = Expressions.TWO; + var three = Expressions.THREE; + Path col1 = Expressions.path(Integer.class, "col1"); + Union union = query.union(select(one.as(col1)), select(two), select(three)); + + assertThat(union.toString()) + .isEqualTo( + """ + select 1 as col1 + union + select 2 + union + select 3"""); + } + + @Test + public void precedence() { + // || + // * / % + var p1 = getPrecedence(Ops.MULT, Ops.DIV, Ops.MOD); + // + - + var p2 = getPrecedence(Ops.ADD, Ops.SUB); + // << >> & | + // < <= > >= + var p3 = getPrecedence(Ops.LT, Ops.GT, Ops.LOE, Ops.GOE); + // = == != <> IS IS NOT IN LIKE GLOB MATCH REGEXP + var p4 = + getPrecedence( + Ops.EQ, + Ops.EQ_IGNORE_CASE, + Ops.IS_NULL, + Ops.IS_NOT_NULL, + Ops.IN, + Ops.LIKE, + Ops.LIKE_ESCAPE, + Ops.MATCHES); + // AND + var p5 = getPrecedence(Ops.AND); + // OR + var p6 = getPrecedence(Ops.OR); + + assertThat(p1 < p2).isTrue(); + assertThat(p2 < p3).isTrue(); + assertThat(p3 < p4).isTrue(); + assertThat(p4 < p5).isTrue(); + assertThat(p5 < p6).isTrue(); + } +} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java index 8d90454c63..95d0d33bb5 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/TypesBase.java @@ -3,6 +3,7 @@ import static com.querydsl.core.Target.CUBRID; import static com.querydsl.core.Target.POSTGRESQL; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import com.querydsl.core.testutil.ExcludeIn; import com.querydsl.core.types.Path; @@ -51,7 +52,7 @@ public void create_tables() { } @Test - @ExcludeIn({CUBRID, POSTGRESQL, TERADATA}) + @ExcludeIn({CUBRID, POSTGRESQL, TERADATA, TURSO}) public void dump_types() throws SQLException { var conn = Connections.getConnection(); var md = conn.getMetaData(); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java index a82749c28b..b241555522 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/UpdateBase.java @@ -21,6 +21,7 @@ import static com.querydsl.core.Target.ORACLE; import static com.querydsl.core.Target.SQLSERVER; import static com.querydsl.core.Target.TERADATA; +import static com.querydsl.core.Target.TURSO; import static com.querydsl.sql.Constants.survey; import static com.querydsl.sql.SQLExpressions.selectOne; import static org.assertj.core.api.Assertions.assertThat; @@ -56,6 +57,7 @@ public void tearDown() throws SQLException { reset(); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update() throws SQLException { // original state @@ -81,6 +83,7 @@ public void update_limit() { assertThat(update(survey).set(survey.name, "S").limit(2).execute()).isEqualTo(2); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update2() throws SQLException { List> paths = Collections.>singletonList(survey.name); @@ -105,6 +108,7 @@ public void update3() { assertThat(update(survey).set(survey.name, survey.name.append("X")).execute()).isEqualTo(1); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update4() { assertThat(insert(survey).values(2, "A", "B").execute()).isEqualTo(1); @@ -112,6 +116,7 @@ public void update4() { .isEqualTo(1); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update5() { assertThat(insert(survey).values(3, "B", "C").execute()).isEqualTo(1); @@ -142,6 +147,7 @@ public void setNullEmptyRootPath() { assertThat(execute(update(survey).setNull(name))).isEqualTo(count); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void batch() throws SQLException { assertThat(insert(survey).values(2, "A", "B").execute()).isEqualTo(1); @@ -155,6 +161,7 @@ public void batch() throws SQLException { assertThat(update.execute()).isEqualTo(2); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void batch_templates() throws SQLException { assertThat(insert(survey).values(2, "A", "B").execute()).isEqualTo(1); @@ -172,6 +179,7 @@ public void batch_templates() throws SQLException { assertThat(update.execute()).isEqualTo(2); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update_with_subQuery_exists() { var survey1 = new QSurvey("s1"); @@ -197,6 +205,7 @@ public void update_with_subQuery_exists_Params() { assertThat(update.execute()).isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update_with_subQuery_exists2() { var survey1 = new QSurvey("s1"); @@ -207,6 +216,7 @@ public void update_with_subQuery_exists2() { assertThat(update.execute()).isEqualTo(0); } + @ExcludeIn(TURSO) // Turso 0.6.0 gap, see #1812 @Test public void update_with_subQuery_notExists() { var survey1 = new QSurvey("s1"); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoLiteralsSuiteTest.java new file mode 100644 index 0000000000..704111d0a7 --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoLiteralsSuiteTest.java @@ -0,0 +1,62 @@ +package com.querydsl.sql.suites; + +import com.querydsl.sql.BeanPopulationBase; +import com.querydsl.sql.Connections; +import com.querydsl.sql.DeleteBase; +import com.querydsl.sql.InsertBase; +import com.querydsl.sql.KeywordQuotingBase; +import com.querydsl.sql.LikeEscapeBase; +import com.querydsl.sql.MergeBase; +import com.querydsl.sql.SelectBase; +import com.querydsl.sql.SubqueriesBase; +import com.querydsl.sql.TursoTemplates; +import com.querydsl.sql.TypesBase; +import com.querydsl.sql.UnionBase; +import com.querydsl.sql.UpdateBase; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; + +@Tag("com.querydsl.core.testutil.Turso") +public class TursoLiteralsSuiteTest extends AbstractSuite { + + @Nested + class BeanPopulation extends BeanPopulationBase {} + + @Nested + class Delete extends DeleteBase {} + + @Nested + class Insert extends InsertBase {} + + @Nested + class KeywordQuoting extends KeywordQuotingBase {} + + @Nested + class LikeEscape extends LikeEscapeBase {} + + @Nested + class Merge extends MergeBase {} + + @Nested + class Select extends SelectBase {} + + @Nested + class Subqueries extends SubqueriesBase {} + + @Nested + class Types extends TypesBase {} + + @Nested + class Union extends UnionBase {} + + @Nested + class Update extends UpdateBase {} + + @BeforeAll + public static void setUp() throws Exception { + Connections.initTurso(); + Connections.initConfiguration(TursoTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } +} diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoSuiteTest.java new file mode 100644 index 0000000000..b8e0395c7a --- /dev/null +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/TursoSuiteTest.java @@ -0,0 +1,61 @@ +package com.querydsl.sql.suites; + +import com.querydsl.sql.BeanPopulationBase; +import com.querydsl.sql.Connections; +import com.querydsl.sql.DeleteBase; +import com.querydsl.sql.InsertBase; +import com.querydsl.sql.KeywordQuotingBase; +import com.querydsl.sql.LikeEscapeBase; +import com.querydsl.sql.MergeBase; +import com.querydsl.sql.SelectBase; +import com.querydsl.sql.SubqueriesBase; +import com.querydsl.sql.TursoTemplates; +import com.querydsl.sql.TypesBase; +import com.querydsl.sql.UnionBase; +import com.querydsl.sql.UpdateBase; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Tag; + +@Tag("com.querydsl.core.testutil.Turso") +public class TursoSuiteTest extends AbstractSuite { + + @Nested + class BeanPopulation extends BeanPopulationBase {} + + @Nested + class Delete extends DeleteBase {} + + @Nested + class Insert extends InsertBase {} + + @Nested + class KeywordQuoting extends KeywordQuotingBase {} + + @Nested + class LikeEscape extends LikeEscapeBase {} + + @Nested + class Merge extends MergeBase {} + + @Nested + class Select extends SelectBase {} + + @Nested + class Subqueries extends SubqueriesBase {} + + @Nested + class Types extends TypesBase {} + + @Nested + class Union extends UnionBase {} + + @Nested + class Update extends UpdateBase {} + + @BeforeAll + public static void setUp() throws Exception { + Connections.initTurso(); + Connections.initConfiguration(TursoTemplates.builder().newLineToSingleSpace().build()); + } +} diff --git a/querydsl-tooling/querydsl-sql-codegen/pom.xml b/querydsl-tooling/querydsl-sql-codegen/pom.xml index 2492d0074e..1921790949 100644 --- a/querydsl-tooling/querydsl-sql-codegen/pom.xml +++ b/querydsl-tooling/querydsl-sql-codegen/pom.xml @@ -142,6 +142,13 @@ test + + tech.turso + turso + ${turso.version} + test + + io.github.openfeign.querydsl querydsl-core diff --git a/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportTursoTest.java b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportTursoTest.java new file mode 100644 index 0000000000..ff9ae3d0af --- /dev/null +++ b/querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/ExportTursoTest.java @@ -0,0 +1,18 @@ +package com.querydsl.sql.codegen; + +import com.querydsl.sql.Connections; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; + +// Turso 0.6.0 JDBC DatabaseMetaData.getPrimaryKeys() returns null, so schema export codegen +// cannot read the database metadata. Re-enable once the driver implements it. See #1812. +@Disabled("Turso 0.6.0 JDBC metadata (getPrimaryKeys) incomplete, see #1812") +@Tag("com.querydsl.core.testutil.Turso") +public class ExportTursoTest extends ExportBaseTest { + + @BeforeAll + public static void setUpClass() throws Exception { + Connections.initTurso(); + } +} From 995520121cfabec5cb731f5ad97a8237321d5662 Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 21 Jun 2026 17:35:10 -0300 Subject: [PATCH 61/62] test: enable CUBRID integration test suites (#1815) --- .../src/test/java/com/querydsl/sql/KeywordQuotingBase.java | 5 +++++ .../src/test/java/com/querydsl/sql/SelectBase.java | 2 +- .../com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java | 2 -- .../test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java index 0b9a94ad4c..0842181097 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/KeywordQuotingBase.java @@ -15,9 +15,11 @@ */ package com.querydsl.sql; +import static com.querydsl.core.Target.CUBRID; import static org.assertj.core.api.Assertions.assertThat; import com.google.common.base.Splitter; +import com.querydsl.core.testutil.ExcludeIn; import com.querydsl.core.types.PathMetadata; import com.querydsl.core.types.PathMetadataFactory; import com.querydsl.core.types.dsl.BooleanPath; @@ -86,6 +88,9 @@ public void keywords() { } @Test + // The bundled CUBRID 9.3.9 JDBC driver reports a malformed keyword list (e.g. "TATISTICS", + // "DATA_TYPE___"), so completeness against the curated keyword file cannot be asserted. + @ExcludeIn(CUBRID) public void validateKeywordsCompleteness() throws SQLException { var keywords = switch (target) { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java index ff4cf44f6d..2fff363567 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/SelectBase.java @@ -782,7 +782,7 @@ public void date_trunc() { } @Test - @ExcludeIn({SQLITE, TERADATA, DERBY, H2, TURSO}) // FIXME + @ExcludeIn({SQLITE, TERADATA, DERBY, H2, TURSO, CUBRID}) // FIXME public void date_trunc2() { DateTimeExpression expr = DateTimeExpression.currentTimestamp(LocalDateTime.class); diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java index 8d31d6bb63..58039154e3 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDLiteralsSuiteTest.java @@ -14,11 +14,9 @@ import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Tag; -@Disabled @Tag("com.querydsl.core.testutil.CUBRID") public class CUBRIDLiteralsSuiteTest extends AbstractSuite { diff --git a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java index c9c8580a00..5dc116c0ea 100644 --- a/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java +++ b/querydsl-libraries/querydsl-sql/src/test/java/com/querydsl/sql/suites/CUBRIDSuiteTest.java @@ -14,11 +14,9 @@ import com.querydsl.sql.UnionBase; import com.querydsl.sql.UpdateBase; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Tag; -@Disabled @Tag("com.querydsl.core.testutil.CUBRID") public class CUBRIDSuiteTest extends AbstractSuite { From adcca975004f17c5ba63eab822f1d5cc8a77c13e Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 21 Jun 2026 17:35:26 -0300 Subject: [PATCH 62/62] ci: migrate from CircleCI to GitHub Actions with cached core-jar build (#1814) --- .circleci/config.yml | 540 ------------------ .github/actions/setup-build/action.yml | 47 ++ {.circleci => .github}/settings.xml | 16 - .github/workflows/build-and-test.yml | 466 +++++++++++++++ .github/workflows/dependency-submission.yml | 2 +- .github/workflows/deploy.yml | 66 +++ .../querydsl-example-jpa-quarkus/Dockerfile | 15 +- 7 files changed, 593 insertions(+), 559 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/actions/setup-build/action.yml rename {.circleci => .github}/settings.xml (54%) create mode 100644 .github/workflows/build-and-test.yml create mode 100644 .github/workflows/deploy.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 3e15ab7c83..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,540 +0,0 @@ -# -# Copyright 2012-2020 The Feign Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# - -# common executors -executors: - java: - docker: - - image: velo/toolchains-4-ci-builds:with-25 - -# common commands -commands: - resolve-dependencies: - description: 'Download and prepare all dependencies' - steps: - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Check if cache was restored' - command: | - if [ -d ~/.m2/repository/io/github/openfeign/querydsl ]; then - echo "Cache hit detected, skipping resolve job." - circleci step halt - else - echo "No cache hit, proceeding with resolve." - fi - - run: - name: 'Resolving Dependencies' - command: | - ./mvnw -ntp -B dependency:resolve-plugins go-offline:resolve-dependencies -DskipTests=true - - save-test-results: - steps: - - run: - name: Save package results - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - - configure-gpg: - steps: - - run: - name: 'Configure GPG keys' - command: | - echo -e "$GPG_KEY" | base64 -d | gpg --batch --yes --import - -# our job defaults -defaults: &defaults - environment: - # Customize the JVM maximum heap limit - MAVEN_OPTS: -Xmx3200m - JAVA_HOME: /usr/lib/jvm/java-25-openjdk-amd64 - -# branch filters -master-only: &master-only - branches: - only: - - master - - /querydsl-.*/ - -tags-only: &tags-only - branches: - ignore: /.*/ - tags: - only: /.*/ - -all-branches: &all-branches - branches: - ignore: - - master - - /querydsl-.*/ - tags: - ignore: /.*/ - -version: 2.1 - -jobs: - resolve: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - steps: - - checkout - - resolve-dependencies - - save_cache: - paths: - - ~/.m2/repository - key: m2repo-{{ checksum "pom.xml" }} - test: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - no_output_timeout: 60m - command: | - ./mvnw -ntp -B verify -Pno-databases - - save-test-results - - windows: - machine: - image: windows-server-2019-vs2019:current # Windows machine image - resource_class: windows.medium - environment: - MAVEN_OPTS: -Xmx3200m - - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Install JDK 25' - command: | - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://api.adoptium.net/v3/binary/latest/25/ga/windows/x64/jdk/hotspot/normal/eclipse?project=jdk" -OutFile "$env:TEMP\jdk.zip" - Expand-Archive -Path "$env:TEMP\jdk.zip" -DestinationPath "C:\jdk25" - $jdkDir = Get-ChildItem "C:\jdk25" -Directory | Select-Object -First 1 - [Environment]::SetEnvironmentVariable("JAVA_HOME", $jdkDir.FullName, "Machine") - Write-Host "JAVA_HOME set to $($jdkDir.FullName)" - & "$($jdkDir.FullName)\bin\java" -version - shell: powershell.exe - - run: - name: 'Test' - command: | - export JAVA_HOME="$(ls -d /c/jdk25/jdk-* | head -1)" - export PATH="$JAVA_HOME/bin:$PATH" - java -version - ./mvnw -ntp -B verify -Pno-databases -Dtoolchain.skip=true - shell: bash.exe - - buildExamples: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Prepare environment' - command: | - ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am - - run: - name: 'Build and test examples' - command: | - ./mvnw -ntp -B install -Pexamples -rf :querydsl-examples - - save-test-results - buildQuarkusExample: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: cimg/base:2022.06 - steps: - - checkout - - setup_remote_docker: - docker_layer_caching: true - - run: - name: 'Test' - command: | - cp querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile . - docker build --progress=plain . - buildKotlinKspExample: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - steps: - - checkout - - run: - name: 'Prepare environment' - command: | - ./mvnw -N org.codehaus.mojo:properties-maven-plugin:1.2.1:write-project-properties -Dproperties.outputFile=querydsl-examples/querydsl-example-ksp-codegen/gradle.properties - ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-ksp-codegen,:querydsl-jpa -am - - run: - name: 'Build and test examples' - environment: - JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64 - command: | - cd querydsl-examples/querydsl-example-ksp-codegen - ./gradlew --no-daemon --console=plain --info --stacktrace test - - run: - name: 'Save test results' - command: | - mkdir -p ~/test-results/junit/ - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \; - when: always - - store_test_results: - path: ~/test-results - testMySQL: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: mysql:5.6.38 - environment: - - MYSQL_ROOT_PASSWORD=querydsl - - MYSQL_USER=querydsl - - MYSQL_PASSWORD=querydsl - - MYSQL_DATABASE=querydsl - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.MySQL - - save-test-results - testPostgreSQL: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: postgis/postgis:16-3.4-alpine - environment: - - POSTGRES_USER=querydsl - - POSTGRES_PASSWORD=querydsl - - POSTGRES_DB=querydsl - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.PostgreSQL - - save-test-results - testCUBRID: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: cubrid/cubrid:11.3 - environment: - - CUBRID_DB=demodb - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.CUBRID - - save-test-results - testOracle: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: gvenzl/oracle-xe:slim-faststart - environment: - - ORACLE_PASSWORD=querydsl - - APP_USER=querydsl - - APP_USER_PASSWORD=querydsl - - TZ=UTC - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.Oracle - - save-test-results - testMongo: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: mongo:8.0.9 - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.MongoDB - - save-test-results - testFirebird: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - - image: jacobalberty/firebird:v4 - environment: - - ISC_PASSWORD=masterkey - - FIREBIRD_DATABASE=querydsl.fdb - - FIREBIRD_USER=querydsl - - FIREBIRD_PASSWORD=querydsl - - TZ=UTC - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.Firebird - - save-test-results - testEmbedded: - <<: *defaults - working_directory: ~/querydsl - docker: - - image: velo/toolchains-4-ci-builds:with-25 - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: 'Test' - command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.EmbeddedDatabase,com.querydsl.core.testutil.Turso - - save-test-results - testDB2: - # Use the machine executor so we have full VM capabilities (e.g. docker running as admin) - machine: true - working_directory: ~/querydsl - environment: - DB2INST1_PASSWORD: a3sd!fDj - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - run: - name: "Start DB2 container" - command: | - docker run -d --privileged --name db2 \ - -p 50000:50000 \ - -e DB2INST1_PASSWORD=a3sd!fDj \ - -e DB2INSTANCE=db2inst1 \ - -e DBNAME=sample \ - -e LICENSE=accept \ - -e ARCHIVE_LOGS=false \ - -e AUTOCONFIG=false \ - ibmcom/db2:11.5.0.0 - - echo "Waiting for DB2 to initialize..." - for i in {1..60}; do - if docker logs db2 2>&1 | grep -q "All databases are now active"; then - echo "DB2 appears to be up" - break - fi - echo "Waiting ($i/60)..." - sleep 10 - done - docker ps - - run: - name: "Run DB2 tests" - command: | - docker run --rm \ - --network host \ - -v $(pwd):/code \ - -v ~/.m2/repository:/root/.m2/repository \ - -w /code \ - -e MAVEN_OPTS=-Xmx3200m \ - -e JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64 \ - velo/toolchains-4-ci-builds:with-25 \ - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.DB2 - - run: - name: "Stop and remove DB2 container" - command: | - docker stop db2 && docker rm db2 - when: always - - save-test-results - - deploySnapshot: - executor: - name: java - <<: *defaults - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - configure-gpg - - run: - name: 'Deploy Core Modules Sonatype' - no_output_timeout: 4h - command: | - ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease -pl '!:querydsl-apt-test' - - deployRelease: - executor: - name: java - <<: *defaults - steps: - - checkout - - restore_cache: - keys: - - m2repo-{{ checksum "pom.xml" }} - - configure-gpg - - run: - name: 'Deploy Core Modules Sonatype' - no_output_timeout: 4h - command: | - ./mvnw -ntp -B -nsu -s .circleci/settings.xml -DskipTests=true deploy -Prelease,staging -pl '!:querydsl-apt-test' - -workflows: - version: 2 - build: - jobs: - - resolve: - name: 'Resolve dependencies' - filters: - <<: *all-branches - - test: - name: 'Compile and package (no external databases)' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - windows: - name: 'Compile and package on Windows (no external databases)' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - buildExamples: - name: 'Compile and package Examples' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - buildQuarkusExample: - name: 'Compile and test Quarkus Native Example' - filters: - <<: *all-branches - - buildKotlinKspExample: - name: 'Compile and test Kotlin KSP Example' - filters: - <<: *all-branches - - testMySQL: - name: 'Test MySQL' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testPostgreSQL: - name: 'Test PostgreSQL' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testCUBRID: - name: 'Test CUBRID' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testOracle: - name: 'Test Oracle' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testMongo: - name: 'Test MongoDB' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testFirebird: - name: 'Test Firebird' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testEmbedded: - name: 'Test Embedded databases' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - testDB2: - name: 'Test DB2' - requires: - - 'Resolve dependencies' - filters: - <<: *all-branches - - snapshot: - jobs: - - resolve: - name: 'Resolve dependencies' - filters: - <<: *master-only - - test: - name: 'snapshot' - requires: - - 'Resolve dependencies' - filters: - <<: *master-only - - deploySnapshot: - name: 'deploy snapshot' - requires: - - 'snapshot' - context: central - filters: - <<: *master-only - - release: - jobs: - - deployRelease: - name: 'release to maven central' - context: central - filters: - <<: *tags-only diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml new file mode 100644 index 0000000000..42acb3179f --- /dev/null +++ b/.github/actions/setup-build/action.yml @@ -0,0 +1,47 @@ +name: "Setup build environment" +description: "Install JDKs (17/21/25), generate Maven toolchains.xml, and restore the Maven dependency cache" + +runs: + using: "composite" + steps: + - name: Set up JDKs 17, 21 and 25 + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: | + 17 + 21 + 25 + + - name: Generate Maven toolchains.xml + shell: bash + run: | + mkdir -p ~/.m2 + cat > ~/.m2/toolchains.xml < + + + jdk + 17 + ${JAVA_HOME_17_X64} + + + jdk + 21 + ${JAVA_HOME_21_X64} + + + jdk + 25 + ${JAVA_HOME_25_X64} + + + EOF + + - name: Cache Maven dependencies + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: maven-deps-${{ hashFiles('**/pom.xml') }} + restore-keys: | + maven-deps- diff --git a/.circleci/settings.xml b/.github/settings.xml similarity index 54% rename from .circleci/settings.xml rename to .github/settings.xml index f0f6ad85a5..6025416797 100644 --- a/.circleci/settings.xml +++ b/.github/settings.xml @@ -1,18 +1,3 @@ - + ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl ${{ env.SQL_MODULES }} + -Dgroups=com.querydsl.core.testutil.H2,com.querydsl.core.testutil.HSQLDB,com.querydsl.core.testutil.Derby,com.querydsl.core.testutil.SQLite,com.querydsl.core.testutil.Turso + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (embedded)" + + mysql: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + services: + mysql: + image: mysql:5.6.38 + env: + MYSQL_ROOT_PASSWORD: querydsl + MYSQL_USER: querydsl + MYSQL_PASSWORD: querydsl + MYSQL_DATABASE: querydsl + ports: + - 3306:3306 + options: >- + --health-cmd="mysqladmin ping -h localhost -uroot -pquerydsl" + --health-interval=10s --health-timeout=5s --health-retries=20 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Test MySQL + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl ${{ env.SQL_MODULES }} -Dgroups=com.querydsl.core.testutil.MySQL + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (MySQL)" + + postgresql: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + services: + postgres: + image: postgis/postgis:16-3.4-alpine + env: + POSTGRES_USER: querydsl + POSTGRES_PASSWORD: querydsl + POSTGRES_DB: querydsl + ports: + - 5432:5432 + options: >- + --health-cmd="pg_isready -U querydsl" --health-interval=10s + --health-timeout=5s --health-retries=20 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Test PostgreSQL + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl ${{ env.SQL_MODULES }} -Dgroups=com.querydsl.core.testutil.PostgreSQL + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (PostgreSQL)" + + oracle: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 40 + services: + oracle: + image: gvenzl/oracle-xe:slim-faststart + env: + ORACLE_PASSWORD: querydsl + APP_USER: querydsl + APP_USER_PASSWORD: querydsl + TZ: UTC + ports: + - 1521:1521 + options: >- + --health-cmd="healthcheck.sh" --health-interval=10s + --health-timeout=5s --health-retries=30 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Test Oracle + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl ${{ env.ORACLE_MODULES }} -Dgroups=com.querydsl.core.testutil.Oracle + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (Oracle)" + + cubrid: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + services: + cubrid: + image: cubrid/cubrid:11.3 + env: + CUBRID_DB: demodb + ports: + - 30000:30000 + - 33000:33000 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Wait for CUBRID demodb to be ready + run: | + for i in $(seq 1 30); do + if docker logs "${{ job.services.cubrid.id }}" 2>&1 | grep -q "cubrid server start: demodb"; then + echo "CUBRID demodb server has started"; sleep 5; break + fi + echo "Waiting for CUBRID demodb ($i/30)..."; sleep 5 + done + - name: Test CUBRID + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl :querydsl-sql -Dgroups=com.querydsl.core.testutil.CUBRID + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (CUBRID)" + + firebird: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + services: + firebird: + image: jacobalberty/firebird:v4 + env: + ISC_PASSWORD: masterkey + FIREBIRD_DATABASE: querydsl.fdb + FIREBIRD_USER: querydsl + FIREBIRD_PASSWORD: querydsl + TZ: UTC + ports: + - 3050:3050 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Wait for Firebird + run: | + for i in $(seq 1 30); do + if (echo > /dev/tcp/localhost/3050) >/dev/null 2>&1; then + echo "Firebird is accepting connections"; break + fi + echo "Waiting for Firebird ($i/30)..."; sleep 5 + done + - name: Test Firebird + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl :querydsl-sql -Dgroups=com.querydsl.core.testutil.Firebird + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (Firebird)" + + mongodb: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + services: + mongo: + image: mongo:8.0.9 + ports: + - 27017:27017 + options: >- + --health-cmd="mongosh --eval 'db.runCommand({ ping: 1 })'" + --health-interval=10s --health-timeout=5s --health-retries=20 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Test MongoDB + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl :querydsl-mongodb -Dgroups=com.querydsl.core.testutil.MongoDB + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (MongoDB)" + + db2: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 40 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Start DB2 container + run: | + docker run -d --privileged --name db2 \ + -p 50000:50000 \ + -e DB2INST1_PASSWORD=a3sd!fDj \ + -e DB2INSTANCE=db2inst1 \ + -e DBNAME=sample \ + -e LICENSE=accept \ + -e ARCHIVE_LOGS=false \ + -e AUTOCONFIG=false \ + ibmcom/db2:11.5.0.0 + echo "Waiting for DB2 to initialize..." + for i in $(seq 1 60); do + if docker logs db2 2>&1 | grep -q "All databases are now active"; then + echo "DB2 appears to be up"; break + fi + echo "Waiting ($i/60)..."; sleep 10 + done + - name: Test DB2 + run: ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pci -pl :querydsl-sql -Dgroups=com.querydsl.core.testutil.DB2 + - name: Stop DB2 container + if: always() + run: docker stop db2 && docker rm db2 + - name: Publish test report + uses: mikepenz/action-junit-report@v5 + if: always() + with: + report_paths: "**/target/surefire-reports/TEST-*.xml" + check_name: "Test report (DB2)" + + examples: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Prepare example prerequisites + run: > + ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pquickbuild + -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am + - name: Build and test examples + run: ./mvnw -ntp -B install -Pexamples -rf :querydsl-examples + + examples-quarkus: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Stage Querydsl artifacts for the image build + run: | + mkdir -p /tmp/m2inject/io/github/openfeign + cp -r ~/.m2/repository/io/github/openfeign/querydsl /tmp/m2inject/io/github/openfeign/ + - name: Build Quarkus native example image (reusing compiled artifacts) + run: | + DOCKER_BUILDKIT=1 docker build --progress=plain \ + -f querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile \ + --build-context m2=/tmp/m2inject \ + --build-arg REUSE_M2=true . + + examples-ksp: + if: ${{ !github.event.pull_request.draft }} + needs: compile + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v4 + - name: Setup build environment + uses: ./.github/actions/setup-build + - name: Restore build artifacts + uses: actions/cache/restore@v4 + with: + path: ~/.m2/repository/io/github/openfeign/querydsl + key: build-artifacts-${{ github.sha }} + - name: Prepare KSP example prerequisites + run: | + ./mvnw -N org.codehaus.mojo:properties-maven-plugin:1.2.1:write-project-properties -Dproperties.outputFile=querydsl-examples/querydsl-example-ksp-codegen/gradle.properties + ./mvnw -ntp -B install -Deasyjacoco.skip=true -Pquickbuild -pl :querydsl-ksp-codegen,:querydsl-jpa -am + - name: Build and test KSP example + run: | + export JAVA_HOME="$JAVA_HOME_21_X64" + cd querydsl-examples/querydsl-example-ksp-codegen + ./gradlew --no-daemon --console=plain --info --stacktrace test + + # Single required status check that aggregates every test job. + build: + if: always() && !github.event.pull_request.draft + runs-on: ubuntu-latest + needs: + - compile + - windows + - embedded + - mysql + - postgresql + - oracle + - cubrid + - firebird + - mongodb + - db2 + - examples + - examples-quarkus + - examples-ksp + steps: + - name: Check upstream job results + run: | + echo "Aggregating upstream job results..." + FAILED="" + ALL_SKIPPED=true + NEEDS_JSON='${{ toJSON(needs) }}' + for job in $(echo "$NEEDS_JSON" | jq -r 'keys[]'); do + result=$(echo "$NEEDS_JSON" | jq -r ".[\"$job\"].result") + echo " $job: $result" + if [[ "$result" == "failure" || "$result" == "cancelled" ]]; then + FAILED="$FAILED $job" + fi + if [[ "$result" != "skipped" ]]; then + ALL_SKIPPED=false + fi + done + if [[ "$ALL_SKIPPED" == "true" ]]; then + echo "All upstream jobs were skipped - refusing to report success." + exit 1 + fi + if [[ -n "$FAILED" ]]; then + echo "Failed jobs:$FAILED" + exit 1 + fi + echo "All upstream jobs passed." diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml index 4d963ea23a..4644ccb45a 100644 --- a/.github/workflows/dependency-submission.yml +++ b/.github/workflows/dependency-submission.yml @@ -20,7 +20,7 @@ permissions: contents: write jobs: - build: + dependency-submission: # Dependabot and fork PRs run with a read-only GITHUB_TOKEN, so the # snapshot submission would 403 and fail the check — the likely reason the # original workflow was flaky. Skip those; pushes to master are what keep diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000000..4f8b88c401 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,66 @@ +name: Deploy + +on: + push: + branches: ["master", "querydsl-*"] + tags: ["*"] + +concurrency: + group: deploy-${{ github.ref }} + cancel-in-progress: false + +env: + MAVEN_OPTS: -Xmx3200m + +jobs: + # Deploy SNAPSHOT artifacts to Maven Central on every push to master / querydsl-* branches. + snapshot: + if: startsWith(github.ref, 'refs/heads/') + runs-on: ubuntu-latest + timeout-minutes: 60 + environment: central + steps: + - uses: actions/checkout@v4 + + - name: Setup build environment + uses: ./.github/actions/setup-build + + - name: Import GPG key + run: echo -e "$GPG_KEY" | base64 -d | gpg --batch --yes --import + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + + - name: Deploy snapshot to Maven Central + env: + CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }} + CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: > + ./mvnw -ntp -B -nsu -s .github/settings.xml -DskipTests=true + deploy -Prelease -pl '!:querydsl-apt-test' + + # Deploy a release to Maven Central (staging) when a tag is pushed. + release: + if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + timeout-minutes: 60 + environment: central + steps: + - uses: actions/checkout@v4 + + - name: Setup build environment + uses: ./.github/actions/setup-build + + - name: Import GPG key + run: echo -e "$GPG_KEY" | base64 -d | gpg --batch --yes --import + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + + - name: Deploy release to Maven Central + env: + CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }} + CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: > + ./mvnw -ntp -B -nsu -s .github/settings.xml -DskipTests=true + deploy -Prelease,staging -pl '!:querydsl-apt-test' diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile b/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile index 6831392879..96ab61d354 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile +++ b/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile @@ -1,7 +1,18 @@ +# Optional pre-built Querydsl artifacts, injected by CI's "compile" job via +# --build-context m2= --build-arg REUSE_M2=true +# so the image build does not have to recompile Querydsl from source. Empty by default, +# so a plain `docker build` still works standalone (it rebuilds Querydsl itself). +FROM scratch AS m2 + FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-25 AS build +ARG REUSE_M2=false COPY --chown=quarkus:quarkus . /code/ +COPY --from=m2 --chown=quarkus:quarkus . /home/quarkus/.m2/repository/ USER quarkus WORKDIR /code -RUN ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-jpa -am -Dtoolchain.skip -Dgcf.skip -RUN ./mvnw verify -Dnative -Pexamples -pl :querydsl-example-jpa-quarkus -Dtoolchain.skip -Dgcf.skip +# Build Querydsl from source only when prebuilt artifacts were not injected. +RUN if [ "$REUSE_M2" != "true" ]; then \ + ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-jpa -am -Dtoolchain.skip -Dgcf.skip ; \ + fi +RUN ./mvnw -ntp -B verify -Dnative -Pexamples -pl :querydsl-example-jpa-quarkus -Dtoolchain.skip -Dgcf.skip