diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java index 67c16af169..a16c1a719a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java @@ -56,24 +56,24 @@ public class YamlProcessorTests { } @Test - public void testStringResource() { + public void stringResource() { this.processor.setResources(new ByteArrayResource("foo # a document that is a literal".getBytes())); this.processor.process((properties, map) -> assertThat(map.get("document")).isEqualTo("foo")); } @Test - public void testBadDocumentStart() { + public void badDocumentStart() { this.processor.setResources(new ByteArrayResource("foo # a document\nbar: baz".getBytes())); - assertThatExceptionOfType(ParserException.class).isThrownBy(() -> - this.processor.process((properties, map) -> {})) + assertThatExceptionOfType(ParserException.class) + .isThrownBy(() -> this.processor.process((properties, map) -> {})) .withMessageContaining("line 2, column 1"); } @Test - public void testBadResource() { + public void badResource() { this.processor.setResources(new ByteArrayResource("foo: bar\ncd\nspam:\n foo: baz".getBytes())); - assertThatExceptionOfType(ScannerException.class).isThrownBy(() -> - this.processor.process((properties, map) -> {})) + assertThatExceptionOfType(ScannerException.class) + .isThrownBy(() -> this.processor.process((properties, map) -> {})) .withMessageContaining("line 3, column 1"); } @@ -82,7 +82,7 @@ public class YamlProcessorTests { this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes())); this.processor.process((properties, map) -> { assertThat(properties.get("bar.spam")).isEqualTo("bucket"); - assertThat(properties.size()).isEqualTo(2); + assertThat(properties).hasSize(2); }); } @@ -91,7 +91,7 @@ public class YamlProcessorTests { this.processor.setResources(new ByteArrayResource("foo: bar\n1: bar".getBytes())); this.processor.process((properties, map) -> { assertThat(properties.get("[1]")).isEqualTo("bar"); - assertThat(properties.size()).isEqualTo(2); + assertThat(properties).hasSize(2); }); } @@ -100,7 +100,7 @@ public class YamlProcessorTests { this.processor.setResources(new ByteArrayResource("foo:\n 1: bar".getBytes())); this.processor.process((properties, map) -> { assertThat(properties.get("foo[1]")).isEqualTo("bar"); - assertThat(properties.size()).isEqualTo(1); + assertThat(properties).hasSize(1); }); } @@ -110,7 +110,7 @@ public class YamlProcessorTests { this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes())); this.processor.process((properties, map) -> { assertThat(properties.get("bar.spam")).isEqualTo("bucket"); - assertThat(properties.size()).isEqualTo(2); + assertThat(properties).hasSize(2); Map flattenedMap = processor.getFlattenedMap(map); assertThat(flattenedMap.get("bar.spam")).isEqualTo("bucket"); assertThat(flattenedMap.size()).isEqualTo(2); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java index a3ce6db697..45b44c7954 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java @@ -33,10 +33,6 @@ import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - - - - /** * Tests for {@link YamlPropertiesFactoryBean}. * @@ -45,9 +41,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; */ public class YamlPropertiesFactoryBeanTests { - @Test - public void testLoadResource() { + public void loadResource() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource("foo: bar\nspam:\n foo: baz".getBytes())); Properties properties = factory.getObject(); @@ -56,17 +51,16 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testBadResource() { + public void badResource() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); - factory.setResources(new ByteArrayResource( - "foo: bar\ncd\nspam:\n foo: baz".getBytes())); - assertThatExceptionOfType(ScannerException.class).isThrownBy( - factory::getObject) + factory.setResources(new ByteArrayResource("foo: bar\ncd\nspam:\n foo: baz".getBytes())); + assertThatExceptionOfType(ScannerException.class) + .isThrownBy(factory::getObject) .withMessageContaining("line 3, column 1"); } @Test - public void testLoadResourcesWithOverride() { + public void loadResourcesWithOverride() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources( new ByteArrayResource("foo: bar\nspam:\n foo: baz".getBytes()), @@ -78,25 +72,23 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadResourcesWithInternalOverride() { + public void loadResourcesWithInternalOverride() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource( "foo: bar\nspam:\n foo: baz\nfoo: bucket".getBytes())); - assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy( - factory::getObject); + assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(factory::getObject); } @Test - public void testLoadResourcesWithNestedInternalOverride() { + public void loadResourcesWithNestedInternalOverride() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource( "foo:\n bar: spam\n foo: baz\nbreak: it\nfoo: bucket".getBytes())); - assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy( - factory::getObject); + assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(factory::getObject); } @Test - public void testLoadResourceWithMultipleDocuments() { + public void loadResourceWithMultipleDocuments() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource( "foo: bar\nspam: baz\n---\nfoo: bag".getBytes())); @@ -106,7 +98,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadResourceWithSelectedDocuments() { + public void loadResourceWithSelectedDocuments() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource( "foo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes())); @@ -118,7 +110,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadResourceWithDefaultMatch() { + public void loadResourceWithDefaultMatch() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setMatchDefault(true); factory.setResources(new ByteArrayResource( @@ -137,7 +129,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadResourceWithoutDefaultMatch() { + public void loadResourceWithoutDefaultMatch() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setMatchDefault(false); factory.setResources(new ByteArrayResource( @@ -159,7 +151,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadResourceWithDefaultMatchSkippingMissedMatch() { + public void loadResourceWithDefaultMatchSkippingMissedMatch() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setMatchDefault(true); factory.setResources(new ByteArrayResource( @@ -178,16 +170,16 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadNonExistentResource() { + public void loadNonExistentResource() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResolutionMethod(ResolutionMethod.OVERRIDE_AND_IGNORE); factory.setResources(new ClassPathResource("no-such-file.yml")); Properties properties = factory.getObject(); - assertThat(properties.size()).isEqualTo(0); + assertThat(properties).isEmpty(); } @Test - public void testLoadNull() { + public void loadNull() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource("foo: bar\nspam:".getBytes())); Properties properties = factory.getObject(); @@ -196,7 +188,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadEmptyArrayValue() { + public void loadEmptyArrayValue() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource("a: alpha\ntest: []".getBytes())); Properties properties = factory.getObject(); @@ -205,7 +197,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadArrayOfString() { + public void loadArrayOfString() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource("foo:\n- bar\n- baz".getBytes())); Properties properties = factory.getObject(); @@ -215,7 +207,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadArrayOfInteger() { + public void loadArrayOfInteger() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource("foo:\n- 1\n- 2".getBytes())); Properties properties = factory.getObject(); @@ -225,7 +217,7 @@ public class YamlPropertiesFactoryBeanTests { } @Test - public void testLoadArrayOfObject() { + public void loadArrayOfObject() { YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); factory.setResources(new ByteArrayResource( "foo:\n- bar:\n spam: crap\n- baz\n- one: two\n three: four".getBytes() @@ -238,9 +230,9 @@ public class YamlPropertiesFactoryBeanTests { assertThat(properties.get("foo")).isNull(); } - @SuppressWarnings("unchecked") @Test - public void testYaml() { + @SuppressWarnings("unchecked") + public void yaml() { Yaml yaml = new Yaml(); Map map = yaml.loadAs("foo: bar\nspam:\n foo: baz", Map.class); assertThat(map.get("foo")).isEqualTo("bar");