Format test checkstyle

- Relates #162

Author: jvalkeal

src/test/java/org/springframework/cli/command/ProjectCatalogInitializerTests.java

@@ -84,6 +84,22 @@ void testPropertyOverride() {
 		});
 	}
 
+	@Test
+	void testWithExistingProjectCatalog() {
+		ApplicationContextRunner contextRunner = new ApplicationContextRunner().withUserConfiguration(
+				ProjectCatalogInitializerTests.ProjectCatalogInitializerWithExistingCatalogConfig.class);
+		contextRunner.run((context) -> {
+			assertThat(context).hasSingleBean(ProjectCatalogCommands.class);
+			ProjectCatalogCommands projectCatalogCommands = context.getBean(ProjectCatalogCommands.class);
+			Table table = (Table) projectCatalogCommands.catalogList(false);
+			assertThat(table.getModel().getRowCount()).isEqualTo(2);
+			TableAssertions.verifyTableValue(table, 1, 0, "fooname");
+			TableAssertions.verifyTableValue(table, 1, 1, "foodescription");
+			TableAssertions.verifyTableValue(table, 1, 2, "foourl");
+			TableAssertions.verifyTableValue(table, 1, 3, "[footag1, footag2]");
+		});
+	}
+
 	@Configuration
 	@EnableConfigurationProperties(SpringCliProjectCatalogProperties.class)
 	static class ProjectCatalogInitializerConfig {
@@ -120,22 +136,6 @@ ProjectCatalogInitializer projectCatalogInitializer(SpringCliUserConfig springCl
 
 	}
 
-	@Test
-	void testWithExistingProjectCatalog() {
-		ApplicationContextRunner contextRunner = new ApplicationContextRunner().withUserConfiguration(
-				ProjectCatalogInitializerTests.ProjectCatalogInitializerWithExistingCatalogConfig.class);
-		contextRunner.run((context) -> {
-			assertThat(context).hasSingleBean(ProjectCatalogCommands.class);
-			ProjectCatalogCommands projectCatalogCommands = context.getBean(ProjectCatalogCommands.class);
-			Table table = (Table) projectCatalogCommands.catalogList(false);
-			assertThat(table.getModel().getRowCount()).isEqualTo(2);
-			TableAssertions.verifyTableValue(table, 1, 0, "fooname");
-			TableAssertions.verifyTableValue(table, 1, 1, "foodescription");
-			TableAssertions.verifyTableValue(table, 1, 2, "foourl");
-			TableAssertions.verifyTableValue(table, 1, 3, "[footag1, footag2]");
-		});
-	}
-
 	@Configuration
 	@EnableConfigurationProperties(SpringCliProjectCatalogProperties.class)
 	static class ProjectCatalogInitializerWithExistingCatalogConfig {

src/test/java/org/springframework/cli/support/CommandRunner.java

@@ -40,7 +40,7 @@
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 
-public class CommandRunner {
+public final class CommandRunner {
 
 	private final ApplicationContext context;
 

src/test/java/org/springframework/cli/support/MockConfigurations.java

@@ -23,6 +23,7 @@
 
 import com.google.common.jimfs.Jimfs;
 import org.jline.terminal.Terminal;
+import org.mockito.Mockito;
 
 import org.springframework.cli.command.BootCommands;
 import org.springframework.cli.command.CommandCommands;
@@ -47,9 +48,6 @@
 import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration;
 import org.springframework.shell.style.ThemeResolver;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class MockConfigurations {
 
 	@Configuration
@@ -58,13 +56,13 @@ public static class MockBaseConfig {
 
 		@Bean
 		Terminal terminal() {
-			Terminal mockTerminal = mock(Terminal.class);
+			Terminal mockTerminal = Mockito.mock(Terminal.class);
 			return mockTerminal;
 		}
 
 		@Bean
 		ThemeResolver themeResolver() {
-			ThemeResolver mockThemeResolver = mock(ThemeResolver.class);
+			ThemeResolver mockThemeResolver = Mockito.mock(ThemeResolver.class);
 			return mockThemeResolver;
 		}
 
@@ -130,19 +128,19 @@ public static class MockFakeUserConfig {
 
 		@Bean
 		SpringCliUserConfig springCliUserConfig() {
-			SpringCliUserConfig mock = mock(SpringCliUserConfig.class);
+			SpringCliUserConfig mock = Mockito.mock(SpringCliUserConfig.class);
 			ProjectRepository pr1 = ProjectRepository.of("jpa", "Learn JPA",
 					"https://github.com/rd-1-2022/rpt-spring-data-jpa", null);
 			ProjectRepository pr2 = ProjectRepository.of("scheduling", "Scheduling",
 					"https://github.com/rd-1-2022/rpt-spring-scheduling-tasks", null);
 			ProjectRepositories prs = new ProjectRepositories();
 			prs.setProjectRepositories(Arrays.asList(pr1, pr2));
-			when(mock.getProjectRepositories()).thenReturn(prs);
+			Mockito.when(mock.getProjectRepositories()).thenReturn(prs);
 			ProjectCatalogs pcs = new ProjectCatalogs();
 			ProjectCatalog pc = ProjectCatalog.of("getting-started", "Spring Getting Started Projects",
 					"https://github.com/rd-1-2022/spring-gs-catalog/", null);
 			pcs.setProjectCatalogs(Arrays.asList(pc));
-			when(mock.getProjectCatalogs()).thenReturn(pcs);
+			Mockito.when(mock.getProjectCatalogs()).thenReturn(pcs);
 			return mock;
 		}