Skip to content

Commit 7c9c822

Browse files
sbrannensbrannen
committed
Polish YAML tests
1 parent c6818fe commit 7c9c822

File tree

2 files changed

+35
-43
lines changed

2 files changed

+35
-43
lines changed

‎spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ public void arrayConvertedToIndexedBeanReference() {
5656
}
5757

5858
@Test
59-
public void testStringResource() {
59+
public void stringResource() {
6060
this.processor.setResources(new ByteArrayResource("foo # a document that is a literal".getBytes()));
6161
this.processor.process((properties, map) -> assertThat(map.get("document")).isEqualTo("foo"));
6262
}
6363

6464
@Test
65-
public void testBadDocumentStart() {
65+
public void badDocumentStart() {
6666
this.processor.setResources(new ByteArrayResource("foo # a document\nbar: baz".getBytes()));
67-
assertThatExceptionOfType(ParserException.class).isThrownBy(() ->
68-
this.processor.process((properties, map) -> {}))
67+
assertThatExceptionOfType(ParserException.class)
68+
.isThrownBy(() -> this.processor.process((properties, map) -> {}))
6969
.withMessageContaining("line 2, column 1");
7070
}
7171

7272
@Test
73-
public void testBadResource() {
73+
public void badResource() {
7474
this.processor.setResources(new ByteArrayResource("foo: bar\ncd\nspam:\n foo: baz".getBytes()));
75-
assertThatExceptionOfType(ScannerException.class).isThrownBy(() ->
76-
this.processor.process((properties, map) -> {}))
75+
assertThatExceptionOfType(ScannerException.class)
76+
.isThrownBy(() -> this.processor.process((properties, map) -> {}))
7777
.withMessageContaining("line 3, column 1");
7878
}
7979

@@ -82,7 +82,7 @@ public void mapConvertedToIndexedBeanReference() {
8282
this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes()));
8383
this.processor.process((properties, map) -> {
8484
assertThat(properties.get("bar.spam")).isEqualTo("bucket");
85-
assertThat(properties.size()).isEqualTo(2);
85+
assertThat(properties).hasSize(2);
8686
});
8787
}
8888

@@ -91,7 +91,7 @@ public void integerKeyBehaves() {
9191
this.processor.setResources(new ByteArrayResource("foo: bar\n1: bar".getBytes()));
9292
this.processor.process((properties, map) -> {
9393
assertThat(properties.get("[1]")).isEqualTo("bar");
94-
assertThat(properties.size()).isEqualTo(2);
94+
assertThat(properties).hasSize(2);
9595
});
9696
}
9797

@@ -100,7 +100,7 @@ public void integerDeepKeyBehaves() {
100100
this.processor.setResources(new ByteArrayResource("foo:\n 1: bar".getBytes()));
101101
this.processor.process((properties, map) -> {
102102
assertThat(properties.get("foo[1]")).isEqualTo("bar");
103-
assertThat(properties.size()).isEqualTo(1);
103+
assertThat(properties).hasSize(1);
104104
});
105105
}
106106

@@ -110,7 +110,7 @@ public void flattenedMapIsSameAsPropertiesButOrdered() {
110110
this.processor.setResources(new ByteArrayResource("foo: bar\nbar:\n spam: bucket".getBytes()));
111111
this.processor.process((properties, map) -> {
112112
assertThat(properties.get("bar.spam")).isEqualTo("bucket");
113-
assertThat(properties.size()).isEqualTo(2);
113+
assertThat(properties).hasSize(2);
114114
Map<String, Object> flattenedMap = processor.getFlattenedMap(map);
115115
assertThat(flattenedMap.get("bar.spam")).isEqualTo("bucket");
116116
assertThat(flattenedMap.size()).isEqualTo(2);

‎spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
3535

36-
37-
38-
39-
4036
/**
4137
* Tests for {@link YamlPropertiesFactoryBean}.
4238
*
@@ -45,9 +41,8 @@
4541
*/
4642
public class YamlPropertiesFactoryBeanTests {
4743

48-
4944
@Test
50-
public void testLoadResource() {
45+
public void loadResource() {
5146
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
5247
factory.setResources(new ByteArrayResource("foo: bar\nspam:\n foo: baz".getBytes()));
5348
Properties properties = factory.getObject();
@@ -56,17 +51,16 @@ public void testLoadResource() {
5651
}
5752

5853
@Test
59-
public void testBadResource() {
54+
public void badResource() {
6055
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
61-
factory.setResources(new ByteArrayResource(
62-
"foo: bar\ncd\nspam:\n foo: baz".getBytes()));
63-
assertThatExceptionOfType(ScannerException.class).isThrownBy(
64-
factory::getObject)
56+
factory.setResources(new ByteArrayResource("foo: bar\ncd\nspam:\n foo: baz".getBytes()));
57+
assertThatExceptionOfType(ScannerException.class)
58+
.isThrownBy(factory::getObject)
6559
.withMessageContaining("line 3, column 1");
6660
}
6761

6862
@Test
69-
public void testLoadResourcesWithOverride() {
63+
public void loadResourcesWithOverride() {
7064
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
7165
factory.setResources(
7266
new ByteArrayResource("foo: bar\nspam:\n foo: baz".getBytes()),
@@ -78,25 +72,23 @@ public void testLoadResourcesWithOverride() {
7872
}
7973

8074
@Test
81-
public void testLoadResourcesWithInternalOverride() {
75+
public void loadResourcesWithInternalOverride() {
8276
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
8377
factory.setResources(new ByteArrayResource(
8478
"foo: bar\nspam:\n foo: baz\nfoo: bucket".getBytes()));
85-
assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(
86-
factory::getObject);
79+
assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(factory::getObject);
8780
}
8881

8982
@Test
90-
public void testLoadResourcesWithNestedInternalOverride() {
83+
public void loadResourcesWithNestedInternalOverride() {
9184
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
9285
factory.setResources(new ByteArrayResource(
9386
"foo:\n bar: spam\n foo: baz\nbreak: it\nfoo: bucket".getBytes()));
94-
assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(
95-
factory::getObject);
87+
assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(factory::getObject);
9688
}
9789

9890
@Test
99-
public void testLoadResourceWithMultipleDocuments() {
91+
public void loadResourceWithMultipleDocuments() {
10092
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
10193
factory.setResources(new ByteArrayResource(
10294
"foo: bar\nspam: baz\n---\nfoo: bag".getBytes()));
@@ -106,7 +98,7 @@ public void testLoadResourceWithMultipleDocuments() {
10698
}
10799

108100
@Test
109-
public void testLoadResourceWithSelectedDocuments() {
101+
public void loadResourceWithSelectedDocuments() {
110102
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
111103
factory.setResources(new ByteArrayResource(
112104
"foo: bar\nspam: baz\n---\nfoo: bag\nspam: bad".getBytes()));
@@ -118,7 +110,7 @@ public void testLoadResourceWithSelectedDocuments() {
118110
}
119111

120112
@Test
121-
public void testLoadResourceWithDefaultMatch() {
113+
public void loadResourceWithDefaultMatch() {
122114
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
123115
factory.setMatchDefault(true);
124116
factory.setResources(new ByteArrayResource(
@@ -137,7 +129,7 @@ public void testLoadResourceWithDefaultMatch() {
137129
}
138130

139131
@Test
140-
public void testLoadResourceWithoutDefaultMatch() {
132+
public void loadResourceWithoutDefaultMatch() {
141133
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
142134
factory.setMatchDefault(false);
143135
factory.setResources(new ByteArrayResource(
@@ -159,7 +151,7 @@ public MatchStatus matches(Properties properties) {
159151
}
160152

161153
@Test
162-
public void testLoadResourceWithDefaultMatchSkippingMissedMatch() {
154+
public void loadResourceWithDefaultMatchSkippingMissedMatch() {
163155
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
164156
factory.setMatchDefault(true);
165157
factory.setResources(new ByteArrayResource(
@@ -178,16 +170,16 @@ public void testLoadResourceWithDefaultMatchSkippingMissedMatch() {
178170
}
179171

180172
@Test
181-
public void testLoadNonExistentResource() {
173+
public void loadNonExistentResource() {
182174
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
183175
factory.setResolutionMethod(ResolutionMethod.OVERRIDE_AND_IGNORE);
184176
factory.setResources(new ClassPathResource("no-such-file.yml"));
185177
Properties properties = factory.getObject();
186-
assertThat(properties.size()).isEqualTo(0);
178+
assertThat(properties).isEmpty();
187179
}
188180

189181
@Test
190-
public void testLoadNull() {
182+
public void loadNull() {
191183
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
192184
factory.setResources(new ByteArrayResource("foo: bar\nspam:".getBytes()));
193185
Properties properties = factory.getObject();
@@ -196,7 +188,7 @@ public void testLoadNull() {
196188
}
197189

198190
@Test
199-
public void testLoadEmptyArrayValue() {
191+
public void loadEmptyArrayValue() {
200192
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
201193
factory.setResources(new ByteArrayResource("a: alpha\ntest: []".getBytes()));
202194
Properties properties = factory.getObject();
@@ -205,7 +197,7 @@ public void testLoadEmptyArrayValue() {
205197
}
206198

207199
@Test
208-
public void testLoadArrayOfString() {
200+
public void loadArrayOfString() {
209201
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
210202
factory.setResources(new ByteArrayResource("foo:\n- bar\n- baz".getBytes()));
211203
Properties properties = factory.getObject();
@@ -215,7 +207,7 @@ public void testLoadArrayOfString() {
215207
}
216208

217209
@Test
218-
public void testLoadArrayOfInteger() {
210+
public void loadArrayOfInteger() {
219211
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
220212
factory.setResources(new ByteArrayResource("foo:\n- 1\n- 2".getBytes()));
221213
Properties properties = factory.getObject();
@@ -225,7 +217,7 @@ public void testLoadArrayOfInteger() {
225217
}
226218

227219
@Test
228-
public void testLoadArrayOfObject() {
220+
public void loadArrayOfObject() {
229221
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
230222
factory.setResources(new ByteArrayResource(
231223
"foo:\n- bar:\n spam: crap\n- baz\n- one: two\n three: four".getBytes()
@@ -238,9 +230,9 @@ public void testLoadArrayOfObject() {
238230
assertThat(properties.get("foo")).isNull();
239231
}
240232

241-
@SuppressWarnings("unchecked")
242233
@Test
243-
public void testYaml() {
234+
@SuppressWarnings("unchecked")
235+
public void yaml() {
244236
Yaml yaml = new Yaml();
245237
Map<String, ?> map = yaml.loadAs("foo: bar\nspam:\n foo: baz", Map.class);
246238
assertThat(map.get("foo")).isEqualTo("bar");

0 commit comments

Comments
 (0)