From 3651ba348d0fc8a88b04df286d2cb9c378cae6c3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 21 Feb 2023 23:45:08 -0800
Subject: [PATCH] Fix checkstyle test violations

---
 ...tIntegrationTest.java => GraphQlTestIntegrationTests.java} | 4 ++--
 .../{ImportCandidatesTest.java => ImportCandidatesTests.java} | 4 ++--
 src/checkstyle/checkstyle-suppressions.xml                    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/{GraphQlTestIntegrationTest.java => GraphQlTestIntegrationTests.java} (92%)
 rename spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/{ImportCandidatesTest.java => ImportCandidatesTests.java} (93%)

diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTest.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java
similarity index 92%
rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTest.java
rename to spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java
index fe0cca64a2..32fbeb0f81 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTest.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.springframework.graphql.test.tester.GraphQlTester;
  * @author Brian Clozel
  */
 @GraphQlTest(BookController.class)
-public class GraphQlTestIntegrationTest {
+public class GraphQlTestIntegrationTests {
 
 	@Autowired
 	private GraphQlTester graphQlTester;
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTest.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
similarity index 93%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTest.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
index 914e2d6198..bdf0fbf946 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTest.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ImportCandidatesTest {
+class ImportCandidatesTests {
 
 	@Test
 	void loadReadsFromClasspathFile() {
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 4d717a0491..ed4e5868c7 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -62,4 +62,6 @@
 	<suppress files="DevToolsR2dbcAutoConfigurationTests" checks="HideUtilityClassConstructor" />
 	<suppress files="AbstractLaunchScriptIntegrationTests" checks="IllegalImport" />
 	<suppress files="SpringBootVersion" checks="JavadocPackage" />
+	<suppress files="WebEndpointTest\.java" checks="SpringTestFileName" />
+	<suppress files="ConversionServiceTest\.java" checks="SpringTestFileName" />
 </suppressions>