diff --git a/.circleci/config.yml b/.circleci/config.yml index 80d7db174..6b57f431b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ executors: java: docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 # common commands commands: @@ -25,7 +25,7 @@ commands: steps: - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Check if cache was restored' command: | @@ -63,6 +63,7 @@ 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 @@ -92,26 +93,27 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 steps: - checkout - resolve-dependencies - save_cache: paths: - - ~/.m2 - key: m2-{{ checksum "pom.xml" }} + - ~/.m2/repository + key: m2repo-{{ checksum "pom.xml" }} test: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' + no_output_timeout: 60m command: | ./mvnw -ntp -B verify -Pno-databases - save-test-results @@ -120,15 +122,31 @@ jobs: machine: image: windows-server-2019-vs2019:current # Windows machine image resource_class: windows.medium + environment: + MAVEN_OPTS: -Xmx3200m steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - 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 @@ -136,16 +154,16 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - 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 -T2 + ./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: | @@ -169,16 +187,18 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - 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 -T2 + ./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 @@ -194,7 +214,7 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: mysql:5.6.38 environment: - MYSQL_ROOT_PASSWORD=querydsl @@ -205,7 +225,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -215,7 +235,7 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: postgis/postgis:16-3.4-alpine environment: - POSTGRES_USER=querydsl @@ -225,7 +245,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -235,7 +255,7 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: cubrid/cubrid:11.3 environment: - CUBRID_DB=demodb @@ -243,7 +263,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -253,7 +273,7 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: gvenzl/oracle-xe:slim-faststart environment: - ORACLE_PASSWORD=querydsl @@ -264,7 +284,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -274,13 +294,13 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: mongo:8.0.9 steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -290,7 +310,7 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 - image: jacobalberty/firebird:v4 environment: - ISC_PASSWORD=masterkey @@ -302,7 +322,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -312,12 +332,12 @@ jobs: <<: *defaults working_directory: ~/querydsl docker: - - image: velo/toolchains-4-ci-builds:latest + - image: velo/toolchains-4-ci-builds:with-25 steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - run: name: 'Test' command: | @@ -328,18 +348,15 @@ jobs: machine: true working_directory: ~/querydsl environment: - # You can also set any DB2-specific environment variables here if needed DB2INST1_PASSWORD: a3sd!fDj steps: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} - # Start the DB2 container in detached mode + - m2repo-{{ checksum "pom.xml" }} - run: name: "Start DB2 container" command: | - # Start the DB2 container with the same settings as your docker-compose file docker run -d --privileged --name db2 \ -p 50000:50000 \ -e DB2INST1_PASSWORD=a3sd!fDj \ @@ -351,7 +368,6 @@ jobs: ibmcom/db2:11.5.0.0 echo "Waiting for DB2 to initialize..." - # Basic health-check loop; replace with a more robust check if available 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" @@ -361,17 +377,23 @@ jobs: sleep 10 done docker ps - - # Run your tests against DB2; adjust the Maven command according to your project - run: name: "Run DB2 tests" command: | - ./mvnw -ntp -B install -Pci -Dgroups=com.querydsl.core.testutil.DB2 -Dtoolchain.skip=true - # Clean up the DB2 container once the tests are done + 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: @@ -382,7 +404,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - configure-gpg - run: name: 'Deploy Core Modules Sonatype' @@ -397,7 +419,7 @@ jobs: - checkout - restore_cache: keys: - - m2-{{ checksum "pom.xml" }} + - m2repo-{{ checksum "pom.xml" }} - configure-gpg - run: name: 'Deploy Core Modules Sonatype' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e06a70fb2..00c18553a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -93,7 +93,7 @@ jobs: uses: actions/setup-java@v4.0.0 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Compile project run: ./mvnw -B -ntp clean package -DskipTests=true -Dtoolchain.skip=true -pl '!:querydsl-kotlin-codegen,!:querydsl-ksp-codegen,!:querydsl-kotlin' diff --git a/pom.xml b/pom.xml index c2964953c..c0feaf061 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 17 - 21 + 25 5.4 @@ -974,6 +974,7 @@ com.querydsl.core.testutil.Database, + com.querydsl.core.testutil.MongoDB, com.querydsl.core.testutil.SlowTest, com.querydsl.core.testutil.Performance, com.querydsl.core.testutil.ReportingOnly @@ -993,6 +994,7 @@ com.querydsl.core.testutil.ExternalDatabase, + com.querydsl.core.testutil.MongoDB, com.querydsl.core.testutil.SlowTest, com.querydsl.core.testutil.Performance, com.querydsl.core.testutil.ReportingOnly @@ -1053,7 +1055,7 @@ org.openrewrite.java.testing.junit5.AssertToAssertions org.openrewrite.java.testing.assertj.JUnitToAssertj org.openrewrite.java.testing.assertj.Assertj - org.openrewrite.java.migrate.UpgradeToJava21 + org.openrewrite.java.migrate.UpgradeToJava25 **/src/main/java/** diff --git a/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile b/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile index ff0ea0fc7..683139287 100644 --- a/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile +++ b/querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile @@ -1,7 +1,7 @@ -FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21 AS build +FROM quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-25 AS build COPY --chown=quarkus:quarkus . /code/ USER quarkus WORKDIR /code -RUN ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-jpa -am -T2 -Dtoolchain.skip -Dgcf.skip +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 diff --git a/querydsl-libraries/querydsl-core/pom.xml b/querydsl-libraries/querydsl-core/pom.xml index ab91987ff..8c00eb4c7 100644 --- a/querydsl-libraries/querydsl-core/pom.xml +++ b/querydsl-libraries/querydsl-core/pom.xml @@ -43,10 +43,16 @@ 2.9.1 test + + org.junit.jupiter + junit-jupiter-params + test + jakarta.annotation jakarta.annotation-api + provided diff --git a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/NameBasedProjection.java b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/NameBasedProjection.java index 9bc4b5b14..c39cc604c 100644 --- a/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/NameBasedProjection.java +++ b/querydsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/NameBasedProjection.java @@ -31,8 +31,8 @@ private Map> collectExpressions(EntityPathBase... entit if (!map.containsKey(name)) { try { Object val = f.get(entity); - if (val instanceof Expression) { - map.put(name, (Expression) val); + if (val instanceof Expression expression) { + map.put(name, expression); } } catch (IllegalAccessException e) { diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java index 4e04694ab..567b1615b 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/BooleanBuilderTest.java @@ -14,76 +14,80 @@ package com.querydsl.core; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import com.querydsl.core.types.ExpressionUtils; import com.querydsl.core.types.Templates; import com.querydsl.core.types.ToStringVisitor; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.Expressions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -public class BooleanBuilderTest { +class BooleanBuilderTest { private final BooleanExpression first = BooleanConstant.TRUE; private final BooleanExpression second = BooleanConstant.FALSE; @Test - public void null_in_constructor() { + void null_in_constructor() { assertThat(new BooleanBuilder(null).getValue()).isNull(); } @Test - public void and_empty() { + void and_empty() { var builder = new BooleanBuilder(); builder.and(new BooleanBuilder()); assertThat(ExpressionUtils.extract(builder)).isNull(); } @Test - public void and_any_of() { + void and_any_of() { var builder = new BooleanBuilder(); builder.andAnyOf(first, null); assertThat(builder.getValue()).isEqualTo(first); } @Test - public void and_any_of2() { + void and_any_of2() { var builder = new BooleanBuilder(); builder.andAnyOf(null, first); assertThat(builder.getValue()).isEqualTo(first); } @Test - public void or_all_of() { + void or_all_of() { var builder = new BooleanBuilder(); builder.orAllOf(first, null); assertThat(builder.getValue()).isEqualTo(first); } @Test - public void or_all_of2() { + void or_all_of2() { var builder = new BooleanBuilder(); builder.orAllOf(null, first); assertThat(builder.getValue()).isEqualTo(first); } - @Test(expected = QueryException.class) - @Ignore - public void wrapped_booleanBuilder() { - new BooleanBuilder(new BooleanBuilder()); + @Test + @Disabled + void wrapped_booleanBuilder() { + assertThatExceptionOfType(QueryException.class) + .isThrownBy( + () -> { + new BooleanBuilder(new BooleanBuilder()); + }); } @Test - public void basic() { + void basic() { // new BooleanBuilder().and(first).or(second); - assertThat(new BooleanBuilder().and(first).or(second).toString()) - .isEqualTo(first.or(second).toString()); + assertThat(new BooleanBuilder().and(first).or(second)).hasToString(first.or(second).toString()); } @Test - public void advanced() { + void advanced() { var builder = new BooleanBuilder(); builder.andAnyOf(first, second, first); builder.orAllOf(first, second, first); @@ -91,7 +95,7 @@ public void advanced() { } @Test - public void if_then_else() { + void if_then_else() { var builder = new BooleanBuilder(); builder.and(null); builder.or(null); @@ -100,60 +104,59 @@ public void if_then_else() { } @Test - public void and_null_supported() { + void and_null_supported() { assertThat(first.and(null)).isEqualTo(first); } @Test - public void or_null_supported() { + void or_null_supported() { assertThat(first.or(null)).isEqualTo(first); } @Test - public void and_not() { + void and_not() { var builder = new BooleanBuilder(); builder.and(first).andNot(second); assertThat(builder.getValue()).isEqualTo(first.and(second.not())); } @Test - public void or_not() { + void or_not() { var builder = new BooleanBuilder(); builder.and(first).orNot(second); assertThat(builder.getValue()).isEqualTo(first.or(second.not())); } @Test - public void not() { + void not() { var builder = new BooleanBuilder(); builder.and(first).not(); assertThat(builder.getValue()).isEqualTo(first.not()); } @Test - public void booleanBuilder_equals_booleanBuilder() { + void booleanBuilder_equals_booleanBuilder() { assertThat(new BooleanBuilder(first)).isEqualTo(new BooleanBuilder(first)); } @Test - public void constant_equals_booleanBuilder() { - assertThat(first.equals(new BooleanBuilder(first))).isFalse(); + void constant_equals_booleanBuilder() { + assertThat(first).isNotEqualTo(new BooleanBuilder(first)); } @Test - public void booleanBuilder_equals_constant() { - assertThat(new BooleanBuilder(first).equals(first)).isFalse(); + void booleanBuilder_equals_constant() { + assertThat(new BooleanBuilder(first)).isNotEqualTo(first); } @Test - public void hashCode_() { - assertThat(new BooleanBuilder(first).hashCode()) - .isEqualTo(new BooleanBuilder(first).hashCode()); - assertThat(new BooleanBuilder().hashCode()).isEqualTo(new BooleanBuilder().hashCode()); + void hashCode_() { + assertThat(new BooleanBuilder(first)).hasSameHashCodeAs(new BooleanBuilder(first)); + assertThat(new BooleanBuilder()).hasSameHashCodeAs(new BooleanBuilder()); } @Test - public void toString_() { + void toString_() { var builder = new BooleanBuilder().and(first); assertThat(builder).hasToString("true"); builder.or(Expressions.booleanPath("condition")); @@ -173,7 +176,7 @@ public void toString_() { // } @Test - public void accept() { + void accept() { var builder = new BooleanBuilder(); builder.and(first); builder.or(Expressions.booleanPath("condition")); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java index 8092b3944..b2e65a834 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CoverageTest.java @@ -27,10 +27,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** The Class CoverageTest. */ -public class CoverageTest { +class CoverageTest { private MatchingFiltersFactory matchers = new MatchingFiltersFactory(QuerydslModule.COLLECTIONS, Target.MEM); @@ -43,7 +43,7 @@ public class CoverageTest { @SuppressWarnings("unchecked") @Test - public void test() throws IllegalArgumentException, IllegalAccessException { + void test() throws Exception { // make sure all Operators are covered in expression factory methods Set usedOperators = new HashSet<>(); List> exprs = new ArrayList<>(); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java index c2ca830b9..1b6b382ad 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/CycleClassInitDependencyTest.java @@ -5,29 +5,32 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Collection; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; -public class CycleClassInitDependencyTest { +class CycleClassInitDependencyTest { private static ClassLoader loader; - @BeforeClass - public static void overrideClassLoader() { + @BeforeAll + static void overrideClassLoader() { loader = Thread.currentThread().getContextClassLoader(); Collection urls = new ClassGraph().getClasspathURLs(); ClassLoader cl = URLClassLoader.newInstance(urls.toArray(new URL[0]), null /*no delegation*/); Thread.currentThread().setContextClassLoader(cl); } - @AfterClass - public static void resetClassLoader() { + @AfterAll + static void resetClassLoader() { Thread.currentThread().setContextClassLoader(loader); } - @Test(timeout = 2000) - public void test() { + @Test + @Timeout(value = 2000, unit = TimeUnit.MILLISECONDS) + void test() { // each thread wants to load one part of the dependency circle ThreadSafety.check( diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java index 40db653c4..788b3617e 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateConstantTest.java @@ -18,12 +18,12 @@ import com.querydsl.core.types.dsl.DateExpression; import java.sql.Date; import java.util.Calendar; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class DateConstantTest { +class DateConstantTest { @Test - public void test() { + void test() { // 1.1.2000 var cal = Calendar.getInstance(); cal.set(Calendar.DAY_OF_MONTH, 1); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java index f8243feed..4e8685132 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DateTimeConstantTest.java @@ -18,12 +18,12 @@ import com.querydsl.core.types.dsl.DateTimeExpression; import java.util.Calendar; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class DateTimeConstantTest { +class DateTimeConstantTest { @Test - public void test() { + void test() { var cal = Calendar.getInstance(); cal.set(Calendar.DAY_OF_MONTH, 1); cal.set(Calendar.MONTH, 0); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java index 0eb026a1a..290d8f794 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DefaultQueryMetadataTest.java @@ -14,6 +14,7 @@ package com.querydsl.core; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import com.querydsl.core.QueryFlag.Position; import com.querydsl.core.types.ConstantImpl; @@ -22,7 +23,7 @@ import com.querydsl.core.types.dsl.StringPath; import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultQueryMetadataTest { @@ -37,95 +38,99 @@ public DefaultQueryMetadataTest() { private final StringPath str2 = Expressions.stringPath("str2"); @Test - public void addWhere_with_null() { + void addWhere_with_null() { metadata.addWhere(null); } @Test - public void addWhere_with_booleanBuilder() { + void addWhere_with_booleanBuilder() { metadata.addWhere(new BooleanBuilder()); } @Test - public void addHaving_with_null() { + void addHaving_with_null() { metadata.addHaving(null); } @Test - public void addHaving_with_booleanBuilder() { + void addHaving_with_booleanBuilder() { metadata.addHaving(new BooleanBuilder()); } - @Test(expected = IllegalArgumentException.class) - public void validation() { - metadata.addWhere(str.isNull()); + @Test + void validation() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> metadata.addWhere(str.isNull())); } @Test - public void validation_no_error_for_groupBy() { + void validation_no_error_for_groupBy() { metadata.addGroupBy(str); } @Test - public void validation_no_error_for_having() { + void validation_no_error_for_having() { metadata.addHaving(str.isNull()); } @Test - public void getGroupBy() { + void getGroupBy() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addGroupBy(str); - assertThat(metadata.getGroupBy()).isEqualTo(Collections.singletonList(str)); + assertThat(metadata.getGroupBy()).containsExactlyElementsOf(Collections.singletonList(str)); } @Test - public void getHaving() { + void getHaving() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addHaving(str.isNotNull()); assertThat(metadata.getHaving()).isEqualTo(str.isNotNull()); } @Test - public void getJoins() { + void getJoins() { metadata.addJoin(JoinType.DEFAULT, str); assertThat(metadata.getJoins()) - .isEqualTo(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); + .containsExactlyElementsOf( + Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); } @Test - public void getJoins2() { + void getJoins2() { metadata.addJoin(JoinType.DEFAULT, str); assertThat(metadata.getJoins()) - .isEqualTo(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); + .containsExactlyElementsOf( + Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); } @Test - public void getJoins3() { + void getJoins3() { metadata.addJoin(JoinType.DEFAULT, str); assertThat(metadata.getJoins()) - .isEqualTo(Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); + .containsExactlyElementsOf( + Collections.singletonList(new JoinExpression(JoinType.DEFAULT, str))); metadata.addJoinCondition(str.isNull()); assertThat(metadata.getJoins()) - .isEqualTo( + .containsExactlyElementsOf( Collections.singletonList( new JoinExpression(JoinType.DEFAULT, str, str.isNull(), Collections.emptySet()))); metadata.addJoin(JoinType.DEFAULT, str2); assertThat(metadata.getJoins()) - .isEqualTo( + .containsExactlyElementsOf( Arrays.asList( new JoinExpression(JoinType.DEFAULT, str, str.isNull(), Collections.emptySet()), new JoinExpression(JoinType.DEFAULT, str2))); } @Test - public void getModifiers() { + void getModifiers() { var modifiers = new QueryModifiers(1L, 2L); metadata.setModifiers(modifiers); assertThat(metadata.getModifiers()).isEqualTo(modifiers); } @Test - public void setLimit() { + void setLimit() { var modifiers = new QueryModifiers(1L, 2L); metadata.setModifiers(modifiers); metadata.setLimit(3L); @@ -135,7 +140,7 @@ public void setLimit() { } @Test - public void setOffset() { + void setOffset() { var modifiers = new QueryModifiers(1L, 1L); metadata.setModifiers(modifiers); metadata.setOffset(2L); @@ -146,22 +151,23 @@ public void setOffset() { @SuppressWarnings("unchecked") @Test - public void getOrderBy() { + void getOrderBy() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addOrderBy(str.asc()); metadata.addOrderBy(str.desc()); - assertThat(metadata.getOrderBy()).isEqualTo(Arrays.asList(str.asc(), str.desc())); + assertThat(metadata.getOrderBy()) + .containsExactlyElementsOf(Arrays.asList(str.asc(), str.desc())); } @Test - public void getProjection() { + void getProjection() { metadata.addJoin(JoinType.DEFAULT, str); metadata.setProjection(str.append("abc")); assertThat(metadata.getProjection()).isEqualTo(str.append("abc")); } @Test - public void getWhere() { + void getWhere() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addWhere(str.eq("b")); metadata.addWhere(str.isNotEmpty()); @@ -169,29 +175,29 @@ public void getWhere() { } @Test - public void isDistinct() { + void isDistinct() { assertThat(metadata.isDistinct()).isFalse(); metadata.setDistinct(true); assertThat(metadata.isDistinct()).isTrue(); } @Test - public void isUnique() { + void isUnique() { assertThat(metadata.isUnique()).isFalse(); metadata.setUnique(true); assertThat(metadata.isUnique()).isTrue(); } @Test - public void joinShouldBeCommitted() { + void joinShouldBeCommitted() { var md = new DefaultQueryMetadata(); md.addJoin(JoinType.DEFAULT, str); var emptyMetadata = new DefaultQueryMetadata(); - assertThat(md.equals(emptyMetadata)).isFalse(); + assertThat(md).isNotEqualTo(emptyMetadata); } @Test - public void clone_() { + void clone_() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addGroupBy(str); metadata.addHaving(str.isNotNull()); @@ -204,33 +210,33 @@ public void clone_() { metadata.addWhere(str.isNotEmpty()); var clone = metadata.clone(); - assertThat(clone.getGroupBy()).isEqualTo(metadata.getGroupBy()); + assertThat(clone.getGroupBy()).containsExactlyElementsOf(metadata.getGroupBy()); assertThat(clone.getHaving()).isEqualTo(metadata.getHaving()); - assertThat(clone.getJoins()).isEqualTo(metadata.getJoins()); + assertThat(clone.getJoins()).containsExactlyElementsOf(metadata.getJoins()); assertThat(clone.getModifiers()).isEqualTo(metadata.getModifiers()); - assertThat(clone.getOrderBy()).isEqualTo(metadata.getOrderBy()); + assertThat(clone.getOrderBy()).containsExactlyElementsOf(metadata.getOrderBy()); assertThat(clone.getProjection()).isEqualTo(metadata.getProjection()); assertThat(clone.getWhere()).isEqualTo(metadata.getWhere()); } @SuppressWarnings("unchecked") @Test - public void setParam() { + void setParam() { metadata.setParam(new Param(String.class, "str"), ConstantImpl.create("X")); assertThat(metadata.getParams()).hasSize(1); - assertThat(metadata.getParams().get(new Param(String.class, "str"))) - .isEqualTo(ConstantImpl.create("X")); + assertThat(metadata.getParams()) + .containsEntry(new Param(String.class, "str"), ConstantImpl.create("X")); } @Test - public void addFlag() { + void addFlag() { var flag = new QueryFlag(Position.START, "X"); metadata.addFlag(flag); assertThat(metadata.hasFlag(flag)).isTrue(); } @Test - public void equals() { + void equals() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addGroupBy(str); metadata.addHaving(str.isNotNull()); @@ -243,28 +249,28 @@ public void equals() { metadata.addWhere(str.isNotEmpty()); QueryMetadata metadata2 = new DefaultQueryMetadata(); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addJoin(JoinType.DEFAULT, str); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addGroupBy(str); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addHaving(str.isNotNull()); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addJoin(JoinType.DEFAULT, str2); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.setModifiers(modifiers); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addOrderBy(str.asc()); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.setProjection(str.append("abc")); - assertThat(metadata.equals(metadata2)).isFalse(); + assertThat(metadata).isNotEqualTo(metadata2); metadata2.addWhere(str.eq("b")); metadata2.addWhere(str.isNotEmpty()); - assertThat(metadata.equals(metadata2)).isTrue(); + assertThat(metadata).isEqualTo(metadata2); } @Test - public void hashCode_() { + void hashCode_() { metadata.addJoin(JoinType.DEFAULT, str); metadata.addGroupBy(str); metadata.addHaving(str.isNotNull()); @@ -279,7 +285,7 @@ public void hashCode_() { } @Test - public void hashCode_empty_metadata() { + void hashCode_empty_metadata() { metadata.hashCode(); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java index 5d1d8cea8..cdd3fbd63 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/DependenciesTest.java @@ -15,16 +15,15 @@ import static org.assertj.core.api.Assertions.assertThat; -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 { +class DependenciesTest { @Test - @Ignore - public void test() throws IOException { + @Disabled + void test() throws Exception { // FIXME var jdepend = new JDepend(); jdepend.addDirectory("target/classes/com/querydsl/alias"); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NameBasedProjectionTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NameBasedProjectionTest.java index 300abd445..e349bcdd0 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NameBasedProjectionTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NameBasedProjectionTest.java @@ -6,9 +6,9 @@ import com.querydsl.core.types.NameBasedProjection; import com.querydsl.core.types.Projections; import java.sql.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class NameBasedProjectionTest { +class NameBasedProjectionTest { public static class AnimalDTO { private boolean alive; @@ -99,7 +99,7 @@ public void setWeight(int weight) { } @Test - public void testSimpleDTOProjectionWithFields() { + void simpleDTOProjectionWithFields() { QAnimal animal = QAnimal.animal; // Create a Date object for testing @@ -247,7 +247,7 @@ public String toString() { * (QAnimal) takes precedence. */ @Test - public void testMultiEntityProjectionWithAnimalAndCat() { + void multiEntityProjectionWithAnimalAndCat() { QAnimal animal = QAnimal.animal; com.querydsl.core.domain.QCat cat = com.querydsl.core.domain.QCat.cat; diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java index dbfc0e904..38b6a5a5d 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/NullExpressionTest.java @@ -14,6 +14,7 @@ package com.querydsl.core; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import com.querydsl.core.domain.Cat; import com.querydsl.core.domain.QCat; @@ -21,12 +22,12 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.Expressions; import java.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class NullExpressionTest { +class NullExpressionTest { @Test - public void withConstructor() { + void withConstructor() { var cat = Projections.constructor( Cat.class, @@ -37,15 +38,16 @@ public void withConstructor() { assertThat(cat).isNotNull(); } - @Test(expected = ExpressionException.class) - public void withoutConstructor() { - var cat = - Projections.constructor( - Cat.class, - Expressions.nullExpression(String.class), - QCat.cat.id, - QCat.cat.birthdate) - .newInstance(null, 1, LocalDate.now()); - assertThat(cat).isNotNull(); + @Test + void withoutConstructor() { + assertThatExceptionOfType(ExpressionException.class) + .isThrownBy( + () -> + Projections.constructor( + Cat.class, + Expressions.nullExpression(String.class), + QCat.cat.id, + QCat.cat.birthdate) + .newInstance(null, 1, LocalDate.now())); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java index 6c9130575..bc3014dcd 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryExecution.java @@ -258,7 +258,7 @@ public final void report() { } fail(buffer.toString()); } else { - System.out.println("Success with " + total + " tests"); + IO.println("Success with " + total + " tests"); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java index 021fcfc99..a4362378e 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryMetadaSerializationTest.java @@ -24,7 +24,6 @@ import com.querydsl.core.types.dsl.NumberPath; import com.querydsl.core.types.dsl.NumberTemplate; import com.querydsl.core.util.ReflectionUtils; -import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -35,14 +34,14 @@ import java.util.Map; import java.util.Set; import java.util.Stack; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class QueryMetadaSerializationTest { +class QueryMetadaSerializationTest { private QueryMetadata metadata = new DefaultQueryMetadata(); @Test - public void serialization() throws IOException, ClassNotFoundException { + void serialization() throws Exception { var expr = Expressions.stringPath("str"); metadata.addJoin(JoinType.DEFAULT, expr); metadata.addFlag(new QueryFlag(Position.AFTER_FILTERS, "")); @@ -56,21 +55,21 @@ public void serialization() throws IOException, ClassNotFoundException { var metadata2 = Serialization.serialize(metadata); - assertThat(metadata2.getFlags()).isEqualTo(metadata.getFlags()); - assertThat(metadata2.getGroupBy().getFirst()).isEqualTo(metadata.getGroupBy().getFirst()); - assertThat(metadata2.getGroupBy()).isEqualTo(metadata.getGroupBy()); + assertThat(metadata2.getFlags()).hasSameElementsAs(metadata.getFlags()); + assertThat(metadata2.getGroupBy()).first().isEqualTo(metadata.getGroupBy().getFirst()); + assertThat(metadata2.getGroupBy()).containsExactlyElementsOf(metadata.getGroupBy()); assertThat(metadata2.getHaving()).isEqualTo(metadata.getHaving()); - assertThat(metadata2.getJoins()).isEqualTo(metadata.getJoins()); + assertThat(metadata2.getJoins()).containsExactlyElementsOf(metadata.getJoins()); assertThat(metadata2.getModifiers()).isEqualTo(metadata.getModifiers()); - assertThat(metadata2.getOrderBy()).isEqualTo(metadata.getOrderBy()); - assertThat(metadata2.getParams()).isEqualTo(metadata.getParams()); + assertThat(metadata2.getOrderBy()).containsExactlyElementsOf(metadata.getOrderBy()); + assertThat(metadata2.getParams()).containsExactlyInAnyOrderEntriesOf(metadata.getParams()); assertThat(metadata2.getProjection()).isEqualTo(metadata.getProjection()); assertThat(metadata2.getWhere()).isEqualTo(metadata.getWhere()); } @SuppressWarnings("unchecked") @Test - public void fullySerializable() { + void fullySerializable() { Set> checked = new HashSet<>( Arrays.asList( diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java index 75c4583ad..156a17ae4 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryModifiersTest.java @@ -14,15 +14,16 @@ package com.querydsl.core; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class QueryModifiersTest { +class QueryModifiersTest { @Test - public void limit() { + void limit() { var modifiers = QueryModifiers.limit(12L); assertThat(modifiers.getLimit()).isEqualTo(Long.valueOf(12)); assertThat(modifiers.getOffset()).isNull(); @@ -30,7 +31,7 @@ public void limit() { } @Test - public void offset() { + void offset() { var modifiers = QueryModifiers.offset(12L); assertThat(modifiers.getOffset()).isEqualTo(Long.valueOf(12)); assertThat(modifiers.getLimit()).isNull(); @@ -38,7 +39,7 @@ public void offset() { } @Test - public void both() { + void both() { var modifiers = new QueryModifiers(1L, 2L); assertThat(modifiers.getLimit()).isEqualTo(Long.valueOf(1)); assertThat(modifiers.getOffset()).isEqualTo(Long.valueOf(2)); @@ -46,7 +47,7 @@ public void both() { } @Test - public void empty() { + void empty() { var modifiers = new QueryModifiers(null, null); assertThat(modifiers.getLimit()).isNull(); assertThat(modifiers.getOffset()).isNull(); @@ -54,31 +55,36 @@ public void empty() { } @Test - public void hashCode_() { + void hashCode_() { var modifiers1 = new QueryModifiers(null, null); var modifiers2 = new QueryModifiers(1L, null); var modifiers3 = new QueryModifiers(null, 1L); - assertThat(QueryModifiers.EMPTY.hashCode()).isEqualTo(modifiers1.hashCode()); - assertThat(QueryModifiers.limit(1L).hashCode()).isEqualTo(modifiers2.hashCode()); - assertThat(QueryModifiers.offset(1L).hashCode()).isEqualTo(modifiers3.hashCode()); + assertThat(QueryModifiers.EMPTY).hasSameHashCodeAs(modifiers1); + assertThat(QueryModifiers.limit(1L)).hasSameHashCodeAs(modifiers2); + assertThat(QueryModifiers.offset(1L)).hasSameHashCodeAs(modifiers3); } - @Test(expected = IllegalArgumentException.class) - public void illegalLimit() { - QueryModifiers.limit(-1); + @Test + void illegalLimit() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> QueryModifiers.limit(-1)); } - @Test(expected = IllegalArgumentException.class) - public void illegalOffset() { - QueryModifiers.offset(-1); + @Test + void illegalOffset() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> QueryModifiers.offset(-1)); } @Test - public void subList() { + void subList() { List ints = Arrays.asList(1, 2, 3, 4, 5); - assertThat(QueryModifiers.offset(2).subList(ints)).isEqualTo(Arrays.asList(3, 4, 5)); - assertThat(QueryModifiers.limit(3).subList(ints)).isEqualTo(Arrays.asList(1, 2, 3)); - assertThat(new QueryModifiers(3L, 1L).subList(ints)).isEqualTo(Arrays.asList(2, 3, 4)); + assertThat(QueryModifiers.offset(2).subList(ints)) + .containsExactlyElementsOf(Arrays.asList(3, 4, 5)); + assertThat(QueryModifiers.limit(3).subList(ints)) + .containsExactlyElementsOf(Arrays.asList(1, 2, 3)); + assertThat(new QueryModifiers(3L, 1L).subList(ints)) + .containsExactlyElementsOf(Arrays.asList(2, 3, 4)); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java index c433de336..14f8b1d65 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/QueryResultsTest.java @@ -18,46 +18,46 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class QueryResultsTest { +class QueryResultsTest { private List list = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9); private QueryResults results = new QueryResults<>(list, 10L, 0L, 20); @Test - public void getResults() { - assertThat(results.getResults()).isEqualTo(list); + void getResults() { + assertThat(results.getResults()).containsExactlyElementsOf(list); } @Test - public void getTotal() { + void getTotal() { assertThat(results.getTotal()).isEqualTo(20L); } @Test - public void isEmpty() { + void isEmpty() { assertThat(results.isEmpty()).isFalse(); } @Test - public void getLimit() { + void getLimit() { assertThat(results.getLimit()).isEqualTo(10L); } @Test - public void getOffset() { - assertThat(results.getOffset()).isEqualTo(0L); + void getOffset() { + assertThat(results.getOffset()).isZero(); } @Test - public void emptyResults() { + void emptyResults() { QueryResults empty = QueryResults.emptyResults(); assertThat(empty.isEmpty()).isTrue(); assertThat(empty.getLimit()).isEqualTo(Long.MAX_VALUE); - assertThat(empty.getOffset()).isEqualTo(0L); - assertThat(empty.getTotal()).isEqualTo(0L); - assertThat(empty.getResults()).isEqualTo(Collections.emptyList()); + assertThat(empty.getOffset()).isZero(); + assertThat(empty.getTotal()).isZero(); + assertThat(empty.getResults()).containsExactlyElementsOf(Collections.emptyList()); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/ReactiveQueryExecution.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/ReactiveQueryExecution.java index 5abe60691..c728e904f 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/ReactiveQueryExecution.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/ReactiveQueryExecution.java @@ -225,7 +225,7 @@ public final void report() { } fail(buffer.toString()); } else { - System.out.println("Success with " + total + " tests"); + IO.println("Success with " + total + " tests"); } } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java index e3edad181..a24c5315b 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/StringConstantTest.java @@ -16,12 +16,12 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.dsl.StringExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class StringConstantTest { +class StringConstantTest { @Test - public void test() { + void test() { assertThat(expr("ab").append("c")).hasToString("abc"); assertThat(expr("bc").prepend("a")).hasToString("abc"); assertThat(expr("ABC").lower()).hasToString("abc"); @@ -30,7 +30,7 @@ public void test() { } @Test - public void test2() { + void test2() { assertThat(expr("ab").append(expr("c"))).hasToString("abc"); assertThat(expr("bc").prepend(expr("a"))).hasToString("abc"); assertThat(expr("ABC").lower()).hasToString("abc"); 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 2de83f95e..7aecc0d56 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 @@ -44,5 +44,5 @@ public enum Target { /** */ TERADATA, /** */ - LUCENE; + LUCENE } 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 b3be88303..72ddc2d14 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 @@ -24,7 +24,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ErrorCollector; public class TemplatesTestBase { @@ -39,7 +39,7 @@ public class TemplatesTestBase { private final String modulePrefix = getClass().getPackage().getName(); @Test - public void default_instance() { + void default_instance() { var templates = querydsl.scan().getSubclasses(Templates.class.getName()).loadClasses(); Set> moduleSpecific = templates.stream().filter(MODULE_SPECIFIC).collect(Collectors.toSet()); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java index d4be976c8..da4792dc5 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/TimeConstantTest.java @@ -18,12 +18,12 @@ import com.querydsl.core.types.dsl.TimeExpression; import java.sql.Time; import java.util.Calendar; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class TimeConstantTest { +class TimeConstantTest { @Test - public void test() { + void test() { var cal = Calendar.getInstance(); cal.set(Calendar.HOUR_OF_DAY, 13); cal.set(Calendar.MINUTE, 30); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java index b6d699220..9d6656601 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/AliasTest.java @@ -17,25 +17,25 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.Path; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AliasTest { @Test - public void alias() { + void alias() { var domainType = Alias.alias(DomainType.class); Alias.alias(DomainType.class, $(domainType.getCollection()).any()); } @Test - public void comparableEntity() { + void comparableEntity() { var entity = Alias.alias(ComparableEntity.class); Path path = $(entity); assertThat(path.getType()).isEqualTo(ComparableEntity.class); } @Test - public void comparableEntity_property() { + void comparableEntity_property() { var entity = Alias.alias(ComparableEntity.class); Path propertyPath = $(entity.getProperty()); assertThat(propertyPath.getType()).isEqualTo(String.class); @@ -43,10 +43,9 @@ public void comparableEntity_property() { } @Test - public void basicUsage() { + void basicUsage() { var domainType = Alias.alias(DomainType.class); - assertThat($(domainType.getFirstName()).lower().toString()) - .isEqualTo("lower(domainType.firstName)"); + assertThat($(domainType.getFirstName()).lower()).hasToString("lower(domainType.firstName)"); assertThat($(domainType.getAge())).hasToString("domainType.age"); assertThat($(domainType.getMap().get("a"))).hasToString("domainType.map.get(a)"); assertThat($(domainType.getList().get(3))).hasToString("domainType.list.get(3)"); @@ -68,20 +67,20 @@ public void basicUsage() { } @Test - public void getAny() { + void getAny() { var domainType = Alias.alias(DomainType.class); assertThat(Alias.getAny(domainType).getType()).isEqualTo(DomainType.class); assertThat(Alias.getAny(domainType.getFirstName()).getType()).isEqualTo(String.class); } @Test - public void otherMethods() { + void otherMethods() { var domainType = Alias.alias(DomainType.class); assertThat(domainType).hasToString("domainType"); } @Test - public void var() { + void var() { assertThat(Alias.var()).hasToString("it"); assertThat(Alias.var(1)).hasToString("varInteger1"); assertThat(Alias.var("X")).hasToString("X"); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java index 9e87c138d..da236bea6 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/CollectionTest.java @@ -17,35 +17,35 @@ import static org.assertj.core.api.Assertions.assertThat; import com.querydsl.core.types.EntityPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class CollectionTest { +class CollectionTest { @Test - public void collectionUsage() { + void collectionUsage() { var domainType = Alias.alias(DomainType.class); - assertThat($(domainType.getCollection()).any().eq(domainType).toString()) - .isEqualTo("any(domainType.collection) = domainType"); - assertThat($(domainType.getSet()).any().eq(domainType).toString()) - .isEqualTo("any(domainType.set) = domainType"); - assertThat($(domainType.getList()).any().eq(domainType).toString()) - .isEqualTo("any(domainType.list) = domainType"); - assertThat($(domainType.getList().getFirst()).eq(domainType).toString()) - .isEqualTo("domainType.list.getFirst() = domainType"); - assertThat($(domainType.getList().get(3)).eq(domainType).toString()) - .isEqualTo("domainType.list.get(3) = domainType"); - assertThat($(domainType.getList()).get(0).eq(domainType).toString()) - .isEqualTo("domainType.list.get(0) = domainType"); - assertThat($(domainType.getMap()).get("key").eq(domainType).toString()) - .isEqualTo("domainType.map.get(key) = domainType"); + assertThat($(domainType.getCollection()).any().eq(domainType)) + .hasToString("any(domainType.collection) = domainType"); + assertThat($(domainType.getSet()).any().eq(domainType)) + .hasToString("any(domainType.set) = domainType"); + assertThat($(domainType.getList()).any().eq(domainType)) + .hasToString("any(domainType.list) = domainType"); + assertThat($(domainType.getList().getFirst()).eq(domainType)) + .hasToString("domainType.list.getFirst() = domainType"); + assertThat($(domainType.getList().get(3)).eq(domainType)) + .hasToString("domainType.list.get(3) = domainType"); + assertThat($(domainType.getList()).get(0).eq(domainType)) + .hasToString("domainType.list.get(0) = domainType"); + assertThat($(domainType.getMap()).get("key").eq(domainType)) + .hasToString("domainType.map.get(key) = domainType"); EntityPath domainTypePath = $(domainType); - assertThat($(domainType.getCollection()).contains(domainTypePath).toString()) - .isEqualTo("domainType in domainType.collection"); + assertThat($(domainType.getCollection()).contains(domainTypePath)) + .hasToString("domainType in domainType.collection"); } @Test - public void collectionUsage_types() { + void collectionUsage_types() { var domainType = Alias.alias(DomainType.class); assertThat($(domainType.getCollection()).any().getType()).isEqualTo(DomainType.class); assertThat($(domainType.getSet()).any().getType()).isEqualTo(DomainType.class); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java index 22b06632e..5b7017fbe 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/ComparablePropertyTest.java @@ -13,9 +13,9 @@ */ package com.querydsl.core.alias; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ComparablePropertyTest { +class ComparablePropertyTest { public static class Entity { @@ -55,7 +55,7 @@ public int hashCode() { } @Test - public void test() { + void test() { var entity = Alias.alias(Entity.class); Alias.$(entity.getProperty()); } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java index d6c69d1fd..00f7a219c 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/FinalPropertyTest.java @@ -13,9 +13,9 @@ */ package com.querydsl.core.alias; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class FinalPropertyTest { +class FinalPropertyTest { public static class Entity { @@ -33,7 +33,7 @@ public void setProperty(Entity2 property) { public static final class Entity2 {} @Test - public void test() { + void test() { var entity = Alias.alias(Entity.class); Alias.$(entity.getProperty()); } diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java index 508f99004..7c47b9aa8 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/MethodTypeTest.java @@ -18,12 +18,12 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MethodTypeTest { @Test - public void get() throws SecurityException, NoSuchMethodException { + void get() throws Exception { var getVal = MethodTypeTest.class.getMethod("getVal"); var hashCode = Object.class.getMethod("hashCode"); var size = Collection.class.getMethod("size"); diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java index c3592f31a..9ee4b96f3 100644 --- a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java +++ b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/alias/PathFactoryTest.java @@ -26,100 +26,100 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class PathFactoryTest { +class PathFactoryTest { private PathFactory pathFactory = new DefaultPathFactory(); private PathMetadata metadata = PathMetadataFactory.forVariable("var"); @Test - public void createArrayPath() { + void createArrayPath() { Path path = pathFactory.createArrayPath(String[].class, metadata); assertThat(path).isNotNull(); } @Test - public void createEntityPath() { + void createEntityPath() { Path path = pathFactory.createEntityPath(Object.class, metadata); assertThat(path).isNotNull(); } @Test - public void createSimplePath() { + void createSimplePath() { Path path = pathFactory.createSimplePath(Object.class, metadata); assertThat(path).isNotNull(); } @Test - public void createComparablePath() { + void createComparablePath() { Path path = pathFactory.createComparablePath(String.class, metadata); assertThat(path).isNotNull(); } @Test - public void createEnumPath() { + void createEnumPath() { Path path = pathFactory.createEnumPath(PropertyType.class, metadata); assertThat(path).isNotNull(); } @Test - public void createDatePath() { + void createDatePath() { Path path = pathFactory.createDatePath(Date.class, metadata); assertThat(path).isNotNull(); } @Test - public void createTimePath() { + void createTimePath() { Path