Cleanup tests

Signed-off-by: Piotr Olaszewski <[email protected]>

Author: piotrooo

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/ApplicationRunnerAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-present 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.
@@ -22,7 +22,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ApplicationRunnerAutoConfigurationTests {
+class ApplicationRunnerAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(ApplicationRunnerAutoConfiguration.class));

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-present 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.
@@ -33,7 +33,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CommandCatalogAutoConfigurationTests {
+class CommandCatalogAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(CommandCatalogAutoConfiguration.class,
@@ -66,7 +66,7 @@ void customCommandCatalog() {
 	@Test
 	void registerCommandRegistration() {
 		this.contextRunner.withUserConfiguration(CustomCommandRegistrationConfiguration.class)
-				.run((context) -> {
+				.run(context -> {
 					CommandCatalog commandCatalog = context.getBean(CommandCatalog.class);
 					assertThat(commandCatalog.getRegistrations().get("customcommand")).isNotNull();
 				});
@@ -153,7 +153,7 @@ static class CustomCommandResolverConfiguration {
 
 		@Bean
 		CommandResolver customCommandResolver() {
-			return () -> Collections.emptyList();
+			return Collections::emptyList;
 		}
 	}
 
@@ -176,9 +176,7 @@ CommandRegistration commandRegistration() {
 			return CommandRegistration.builder()
 				.command("customcommand")
 				.withTarget()
-					.function(ctx -> {
-						return null;
-					})
+					.function(ctx -> null)
 					.and()
 				.build();
 		}

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/JLineShellAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-present 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.

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/LineReaderAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-present 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.
@@ -36,13 +36,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class LineReaderAutoConfigurationTests {
+class LineReaderAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(LineReaderAutoConfiguration.class));
 
 	@Test
-	public void testLineReaderCreated() {
+	void testLineReaderCreated() {
 		this.contextRunner
 				.withUserConfiguration(MockConfiguration.class)
 				.run(context -> {
@@ -53,7 +53,7 @@ public void testLineReaderCreated() {
 	}
 
 	@Test
-	public void testLineReaderCreatedNoHistoryFile() {
+	void testLineReaderCreatedNoHistoryFile() {
 		this.contextRunner
 				.withUserConfiguration(MockConfiguration.class)
 				.withPropertyValues("spring.shell.history.enabled=false")
@@ -65,7 +65,7 @@ public void testLineReaderCreatedNoHistoryFile() {
 	}
 
 	@Test
-	public void testLineReaderCreatedCustomHistoryFile() {
+	void testLineReaderCreatedCustomHistoryFile() {
 		this.contextRunner
 				.withUserConfiguration(MockConfiguration.class)
 				.withPropertyValues("spring.shell.history.name=fakehistory.txt")

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/ParameterResolverAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-present 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.
@@ -28,33 +28,32 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ParameterResolverAutoConfigurationTests {
+class ParameterResolverAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(ParameterResolverAutoConfiguration.class));
 
 	@Test
 	void defaultCompletionResolverExists() {
 		this.contextRunner.withUserConfiguration(CustomShellConversionServiceConfiguration.class)
-				.run((context) -> {
+				.run(context -> {
 					assertThat(context).hasSingleBean(CompletionResolver.class);
 				});
 	}
 
 	@Test
 	void defaultCommandExecutionHandlerMethodArgumentResolversExists() {
 		this.contextRunner.withUserConfiguration(CustomShellConversionServiceConfiguration.class)
-				.run((context) -> {
-					assertThat(context).hasSingleBean(CommandExecutionHandlerMethodArgumentResolvers.class);
-				});
+				.run(context -> assertThat(context)
+						.hasSingleBean(CommandExecutionHandlerMethodArgumentResolvers.class));
 	}
 
 	@Configuration
 	static class CustomShellConversionServiceConfiguration {
 
 		@Bean
 		ShellConversionServiceSupplier shellConversionServiceSupplier() {
-			return () -> new DefaultConversionService();
+			return DefaultConversionService::new;
 		}
 	}
 }

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/ShellRunnerAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-present 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.

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/SpringShellPropertiesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-present 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.
@@ -24,15 +24,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SpringShellPropertiesTests {
+class SpringShellPropertiesTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
 
 	@Test
-	public void defaultNoPropertiesSet() {
+	void defaultNoPropertiesSet() {
 		this.contextRunner
 				.withUserConfiguration(Config1.class)
-				.run((context) -> {
+				.run(context -> {
 					SpringShellProperties properties = context.getBean(SpringShellProperties.class);
 					assertThat(properties.getHistory().isEnabled()).isTrue();
 					assertThat(properties.getHistory().getName()).isNull();
@@ -75,7 +75,7 @@ public void defaultNoPropertiesSet() {
 	}
 
 	@Test
-	public void setProperties() {
+	void setProperties() {
 		this.contextRunner
 				.withPropertyValues("spring.shell.history.enabled=false")
 				.withPropertyValues("spring.shell.history.name=fakename")
@@ -115,7 +115,7 @@ public void setProperties() {
 				.withPropertyValues("spring.shell.option.naming.case-type=camel")
 				.withPropertyValues("spring.shell.context.close=true")
 				.withUserConfiguration(Config1.class)
-				.run((context) -> {
+				.run(context -> {
 					SpringShellProperties properties = context.getBean(SpringShellProperties.class);
 					assertThat(properties.getHistory().isEnabled()).isFalse();
 					assertThat(properties.getHistory().getName()).isEqualTo("fakename");
@@ -159,12 +159,12 @@ public void setProperties() {
 
 
 	@Test
-	public void essentiallyUnset() {
+	void essentiallyUnset() {
 		this.contextRunner
 				.withPropertyValues("spring.shell.help.long-names=")
 				.withPropertyValues("spring.shell.help.short-names=")
 				.withUserConfiguration(Config1.class)
-				.run((context) -> {
+				.run(context -> {
 					SpringShellProperties properties = context.getBean(SpringShellProperties.class);
 					assertThat(properties.getHelp().getLongNames()).isEmpty();
 					assertThat(properties.getHelp().getShortNames()).isEmpty();

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/StandardCommandsAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-present 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.
@@ -28,31 +28,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class StandardCommandsAutoConfigurationTests {
+class StandardCommandsAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(StandardCommandsAutoConfiguration.class));
 
 	@Test
-	public void testCompletionCommand() {
+	void testCompletionCommand() {
 		this.contextRunner
 				.with(disableCommands("help", "clear", "quit", "stacktrace", "script", "history"))
-				.run((context) -> {assertThat(context).doesNotHaveBean(Completion.class);
-		});
+				.run(context -> assertThat(context).doesNotHaveBean(Completion.class));
 		this.contextRunner
 				.with(disableCommands("help", "clear", "quit", "stacktrace", "script", "history", "completion"))
 				.withPropertyValues("spring.shell.command.completion.root-command=fake")
-				.run((context) -> {assertThat(context).doesNotHaveBean(Completion.class);
-		});
+				.run(context -> assertThat(context).doesNotHaveBean(Completion.class));
 		this.contextRunner
 				.with(disableCommands("help", "clear", "quit", "stacktrace", "script", "history"))
 				.withPropertyValues("spring.shell.command.completion.root-command=fake")
-				.run((context) -> {assertThat(context).hasSingleBean(Completion.class);
-		});
+				.run(context -> assertThat(context).hasSingleBean(Completion.class));
 	}
 
 	@Test
-	public void testHelpCommand() {
+	void testHelpCommand() {
 		this.contextRunner
 				.with(disableCommands("clear", "quit", "stacktrace", "script", "history", "completion"))
 				.withPropertyValues("spring.shell.command.help.grouping-mode=flat")
@@ -67,7 +64,7 @@ public void testHelpCommand() {
 	}
 
 	private static Function<ApplicationContextRunner, ApplicationContextRunner> disableCommands(String... commands) {
-		return (cr) -> {
+		return cr -> {
 			for (String command : commands) {
 				cr = cr.withPropertyValues(String.format("spring.shell.command.%s.enabled=false", command));
 			}

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/TerminalUIAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-present 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.
@@ -43,17 +43,15 @@ class TerminalUIAutoConfigurationTests {
 			.withConfiguration(AutoConfigurations.of(TerminalUIAutoConfiguration.class));
 
 	@Test
-	public void terminalUICreated() {
+	void terminalUICreated() {
 		this.contextRunner
 				.withUserConfiguration(MockConfiguration.class)
-				.run(context -> {
-					assertThat(context).hasSingleBean(TerminalUIBuilder.class);
-				});
+				.run(context -> assertThat(context).hasSingleBean(TerminalUIBuilder.class));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void canCustomize() {
+	void canCustomize() {
 		this.contextRunner
 				.withUserConfiguration(TestConfiguration.class, MockConfiguration.class)
 				.run(context -> {
@@ -81,9 +79,7 @@ ThemeResolver mockThemeResolver() {
 
 		@Bean
 		ThemeActive themeActive() {
-			return () -> {
-				return "default";
-			};
+			return () -> "default";
 		}
 
 	}

spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/ThemingAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-present 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.
@@ -37,7 +37,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ThemingAutoConfigurationTests {
+class ThemingAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(ThemingAutoConfiguration.class));
@@ -58,7 +58,7 @@ void createsDefaultBeans() {
 	}
 
 	@Test
-	public void canRegisterCustomTheme() {
+	void canRegisterCustomTheme() {
 		this.contextRunner
 				.withUserConfiguration(CustomThemeConfig.class)
 				.run(context -> {
@@ -113,7 +113,7 @@ public ThemeAssert(Theme actual) {
 
 		public ThemeAssert hasName(String... names) {
 			isNotNull();
-			boolean match = Stream.of(names).filter(n -> actual.getName().equals(n)).findFirst().isPresent();
+			boolean match = Stream.of(names).anyMatch(n -> actual.getName().equals(n));
 			if (!match) {
 				failWithMessage("Expected theme to have names %s but was %s",
 						StringUtils.arrayToCommaDelimitedString(names), actual.getName());