Skip to content

Commit 7b1dced

Browse files
author
Vincent Potucek
committed
[junit] add JupiterBestPractices
- https://docs.openrewrite.org/recipes/java/testing/junit/jupiterbestpractices Signed-off-by: Vincent Potucek <vpotucek@me.com>
1 parent 8429a08 commit 7b1dced

File tree

72 files changed

+248
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+248
-229
lines changed

.github/workflows/sanity-check.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
name: Rewrite ♻️
2-
1+
name: ✅Rewrite
32
on:
43
push:
54
branches:
@@ -10,22 +9,19 @@ on:
109
pull_request:
1110
paths:
1211
- '.github/**'
13-
1412
permissions: {}
15-
1613
jobs:
1714
sanity-check:
18-
name: Sanity Check 🕊
15+
name: 🕊Sanity Check
1916
runs-on: ubuntu-latest
2017
permissions:
2118
security-events: write
2219
steps:
23-
- name: Checkout repository
20+
- name: 📥Checkout Repository
2421
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2522
with:
2623
persist-credentials: false
27-
28-
- name: rewriteDryRun
24+
- name: 🌀Rewrite Dry Run
2925
uses: ./.github/actions/run-gradle
3026
with:
3127
encryptionKey: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

gradle/config/rewrite.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ tags:
99
- static-analysis
1010
- cleanup
1111
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
12+
- org.openrewrite.java.testing.junit.JupiterBestPractices
13+
# - org.openrewrite.staticanalysis.CodeCleanup
14+
# - org.openrewrite.staticanalysis.CommonStaticAnalysis
1715
---

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

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,57 @@ plugins {
22
id("org.openrewrite.rewrite")
33
}
44

5+
dependencies {
6+
rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.22.0")
7+
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.22.0")
8+
}
9+
510
rewrite {
611
activeRecipe("org.junit.openrewrite.SanityCheck")
712
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")
13+
exclusion(
14+
"**AggregatorIntegrationTests.java",
15+
"**AnnotationConsumerInitializerTests.java",
16+
"**Assert**AssertionsTests.java", // trivial import fix.
17+
"**BeforeAndAfterSuiteTests.java",
18+
"**BridgeMethods.java",
19+
"**DiscoverySelectorResolverTests.java",
20+
"**DiscoveryTests.java",
21+
"**DisplayNameGenerationTests.java",
22+
"**DynamicNodeGenerationTests.java",
23+
"**DynamicTestTests.java",
24+
"**ExceptionHandlingTests.java",
25+
"**ExecutionCancellationTests.java",
26+
"**ExtensionRegistrationViaParametersAndFieldsTests.java",
27+
"**InvocationInterceptorTests.java",
28+
"**IsTestMethodTests.java",
29+
"**IsTestTemplateMethodTests.java",
30+
"**JupiterTestDescriptorTests.java",
31+
"**LifecycleMethodUtilsTests.java",
32+
"**MultipleTestableAnnotationsTests.java",
33+
"**NestedContainerEventConditionTests.java",
34+
"**ParallelExecutionIntegrationTests.java",
35+
"**ParameterResolverTests.java",
36+
"**ParameterizedTestIntegrationTests.java",
37+
"**RepeatedTestTests.java",
38+
"**StaticPackagePrivateBeforeMethod.java",
39+
"**SubclassedAssertionsTests.java",
40+
"**TempDirectoryCleanupTests.java",
41+
"**TestCase.java",
42+
"**TestCases.java",
43+
"**TestExecutionExceptionHandlerTests.java",
44+
"**TestInstanceFactoryTests.java",
45+
"**TestTemplateInvocationTestDescriptorTests.java",
46+
"**TestTemplateInvocationTests.java",
47+
"**TestTemplateTestDescriptorTests.java",
48+
"**TestWatcherTests.java",
49+
"**TimeoutExtensionTests.java",
50+
"**UniqueIdTrackingListenerIntegrationTests.java",
51+
"**WorkerThreadPoolHierarchicalTestExecutorServiceTests.java",
52+
"**documentation/src/test/java/example**",
53+
"**org/junit/jupiter/engine/bridge**",
54+
"**testFixtures/java/org/junit/vintage/engine/samples**",
55+
)
1256
setExportDatatables(true)
1357
setFailOnDryRunResults(true)
1458
}
15-
16-
dependencies {
17-
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.22.0")
18-
}

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionClassLoaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
* @since 5.10
3131
*/
32-
public class DisabledIfConditionClassLoaderTests {
32+
class DisabledIfConditionClassLoaderTests {
3333

3434
@Test
3535
// No need to introduce a "disabled" version of this test, since it would simply be the

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @since 5.7
2323
*/
24-
public class DisabledIfConditionTests extends AbstractExecutionConditionTests {
24+
class DisabledIfConditionTests extends AbstractExecutionConditionTests {
2525

2626
@Override
2727
protected ExecutionCondition getExecutionCondition() {

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @since 5.7
2323
*/
24-
public class DisabledIfIntegrationTests {
24+
class DisabledIfIntegrationTests {
2525

2626
@Test
2727
@Disabled("Only used in a unit test via reflection")

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionClassLoaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
* @since 5.10
3131
*/
32-
public class EnabledIfConditionClassLoaderTests {
32+
class EnabledIfConditionClassLoaderTests {
3333

3434
@Test
3535
// No need to introduce a "disabled" version of this test, since it would simply be the

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @since 5.7
2323
*/
24-
public class EnabledIfConditionTests extends AbstractExecutionConditionTests {
24+
class EnabledIfConditionTests extends AbstractExecutionConditionTests {
2525

2626
@Override
2727
protected ExecutionCondition getExecutionCondition() {

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @since 5.7
2323
*/
24-
public class EnabledIfIntegrationTests {
24+
class EnabledIfIntegrationTests {
2525

2626
@Test
2727
@Disabled("Only used in a unit test via reflection")

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/JRETests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
* @since 5.7
3131
*/
32-
public class JRETests {
32+
class JRETests {
3333

3434
private static final JRE CURRENT_JRE = JRE.currentJre();
3535

0 commit comments

Comments
 (0)