Skip to content

Commit bc5d7ff

Browse files
author
Vincent Potucek
committed
[rewrite] add junit5.CleanupAssertions
- https://docs.openrewrite.org/recipes/java/testing/junit5/cleanupassertions - https://docs.openrewrite.org/recipes/java/testing/junit5/junit5bestpractices Signed-off-by: Vincent Potucek <[email protected]> All sources parsed, running active recipes: org.junit.openrewrite.SanityCheck Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertEqualsNullToAssertNull org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorAndPreDestroyCallbackTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Changes have been made to jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java by: org.openrewrite.java.testing.junit5.CleanupAssertions org.openrewrite.java.testing.cleanup.AssertionsArgumentOrder Please review and commit the results.
1 parent b822a12 commit bc5d7ff

File tree

15 files changed

+224
-136
lines changed

15 files changed

+224
-136
lines changed

‎.github/workflows/sanity-check.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: "Sanity Check"
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- 'releases/**'
8+
pull_request:
9+
# The branches below must be a subset of the branches above
10+
branches:
11+
- main
12+
- 'releases/**'
13+
schedule:
14+
- cron: '0 19 * * 3'
15+
16+
concurrency:
17+
# Cancels in-progress runs only for pull requests
18+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
19+
cancel-in-progress: true
20+
21+
permissions: {}
22+
23+
env:
24+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
25+
26+
jobs:
27+
analyze:
28+
name: Analyze (${{ matrix.language }})
29+
runs-on: ubuntu-latest
30+
permissions:
31+
security-events: write
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
include:
36+
- language: actions
37+
build-mode: none
38+
- language: java-kotlin
39+
build-mode: manual
40+
steps:
41+
- name: Check out repository
42+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
43+
with:
44+
persist-credentials: false
45+
- name: Sanity Check
46+
if: matrix.build-mode == 'manual'
47+
uses: ./.github/actions/run-gradle
48+
with:
49+
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
50+
arguments: rewriteDryRun -Dorg.gradle.jvmargs=-Xmx4G

‎gradle/config/rewrite.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
type: specs.openrewrite.org/v1beta/recipe
3+
name: org.junit.openrewrite.SanityCheck
4+
displayName: Apply all Java & Gradle best practices
5+
description: Comprehensive code quality recipe combining modernization, security, and best practices.
6+
tags:
7+
- java
8+
- gradle
9+
- static-analysis
10+
- cleanup
11+
recipeList:
12+
- org.openrewrite.java.format.NormalizeLineBreaks
13+
- org.openrewrite.java.format.RemoveTrailingWhitespace
14+
- org.openrewrite.java.testing.junit5.CleanupAssertions
15+
# blank out breaking, consider individual fix.
16+
# - org.openrewrite.java.testing.junit5.JUnit5BestPractices
17+
---

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ commonCustomUserData = { id = "com.gradle.common-custom-user-data-gradle-plugin"
101101
develocity = { id = "com.gradle.develocity", version = "4.2.2" }
102102
download = { id = "de.undercouch.download", version = "5.6.0" }
103103
errorProne = { id = "net.ltgt.errorprone", version = "4.3.0" }
104+
rewrite = { id = "org.openrewrite.rewrite", version = "7.21.0" }
104105
foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "1.0.0" }
105106
gitPublish = { id = "org.ajoberstar.git-publish", version = "5.1.3" }
106107
jmh = { id = "me.champeau.jmh", version = "0.7.3" }

‎gradle/plugins/common/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ plugins {
77

88
dependencies {
99
implementation("junitbuild.base:dsl-extensions")
10-
implementation(projects.buildParameters)
1110
implementation(projects.backwardCompatibility)
12-
implementation(libs.plugins.kotlin.markerCoordinates)
11+
implementation(projects.buildParameters)
1312
implementation(libs.plugins.bnd.markerCoordinates)
1413
implementation(libs.plugins.commonCustomUserData.markerCoordinates)
1514
implementation(libs.plugins.develocity.markerCoordinates)
1615
implementation(libs.plugins.errorProne.markerCoordinates)
1716
implementation(libs.plugins.foojayResolver.markerCoordinates)
1817
implementation(libs.plugins.jmh.markerCoordinates)
18+
implementation(libs.plugins.kotlin.markerCoordinates)
1919
implementation(libs.plugins.nullaway.markerCoordinates)
20+
implementation(libs.plugins.rewrite.markerCoordinates)
2021
implementation(libs.plugins.shadow.markerCoordinates)
2122
implementation(libs.plugins.spotless.markerCoordinates)
2223
}

‎gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
id("junitbuild.eclipse-conventions")
1010
id("junitbuild.jacoco-java-conventions")
1111
id("junitbuild.java-errorprone-conventions")
12+
id("junitbuild.rewrite-conventions")
1213
}
1314

1415
val mavenizedProjects: List<Project> by rootProject.extra

‎gradle/plugins/common/src/main/kotlin/junitbuild.rewrite-conventions.gradle.kts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
plugins {
2+
id("org.openrewrite.rewrite")
3+
}
4+
5+
rewrite {
6+
activeRecipe("org.junit.openrewrite.SanityCheck")
7+
configFile = project.getRootProject().file("gradle/config/rewrite.yml")
8+
// blank out breaking, consider individual fix.
9+
exclusion("**AssertEqualsAssertionsTests.java")
10+
exclusion("**AssertIterableEqualsAssertionsTests.java")
11+
exclusion("**AssertSameAssertionsTests.java")
12+
setExportDatatables(true)
13+
setFailOnDryRunResults(true)
14+
}
15+
16+
dependencies {
17+
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.22.0")
18+
}

‎jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void assertNotSameWithDifferentObjectsAndMessageSupplier() {
3939

4040
@Test
4141
void assertNotSameWithObjectVsNull() {
42-
assertNotSame(new Object(), null);
42+
assertNotSame(null, new Object());
4343
}
4444

4545
@Test

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,21 @@ void beforeAndAfterMethodsInTestClassHierarchy() {
116116
// @formatter:on
117117

118118
// @formatter:off
119-
assertEquals(asList(
120-
"beforeAll1",
119+
assertEquals(callSequence, asList(
120+
"beforeAll1",
121121
"beforeAll2",
122-
"beforeAll3",
123-
"beforeEach1",
124-
"beforeEach2",
125-
"beforeEach3",
126-
"test3",
127-
"afterEach3",
128-
"afterEach2",
129-
"afterEach1",
130-
"afterAll3",
122+
"beforeAll3",
123+
"beforeEach1",
124+
"beforeEach2",
125+
"beforeEach3",
126+
"test3",
127+
"afterEach3",
128+
"afterEach2",
129+
"afterEach1",
130+
"afterAll3",
131131
"afterAll2",
132-
"afterAll1"
133-
), callSequence, "wrong call sequence");
132+
"afterAll1"
133+
), "wrong call sequence");
134134
// @formatter:on
135135
}
136136

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private void performAssertions(Class<?> testClass, Map<String, String> configPar
138138
executionResults.testEvents().assertStatistics(//
139139
stats -> stats.started(numTests).finished(numTests));
140140

141-
assertEquals(Arrays.asList(methods), methodsInvoked);
141+
assertEquals(methodsInvoked, Arrays.asList(methods));
142142
}
143143

144144
// -------------------------------------------------------------------------

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private void assertBeforeAllAndAfterAllCallbacks(Class<?> testClass, int testsSt
182182
executeTestsForClass(testClass).testEvents()//
183183
.assertStatistics(stats -> stats.started(testsStarted).succeeded(testsSuccessful));
184184

185-
assertEquals(asList(expectedCalls), callSequence, () -> "wrong call sequence for " + testClass.getName());
185+
assertEquals(callSequence, asList(expectedCalls), () -> "wrong call sequence for " + testClass.getName());
186186
}
187187

188188
// -------------------------------------------------------------------------

0 commit comments

Comments
 (0)