Skip to content

Commit 518dc6d

Browse files
committed
Polishing
1 parent 59c6b7e commit 518dc6d

File tree

1 file changed

+38
-39
lines changed

1 file changed

+38
-39
lines changed

spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@
5252
public class PropertyAccessTests extends AbstractExpressionTests {
5353

5454
@Test
55-
public void testSimpleAccess01() {
55+
void simpleAccess01() {
5656
evaluate("name", "Nikola Tesla", String.class);
5757
}
5858

5959
@Test
60-
public void testSimpleAccess02() {
60+
void simpleAccess02() {
6161
evaluate("placeOfBirth.city", "SmilJan", String.class);
6262
}
6363

6464
@Test
65-
public void testSimpleAccess03() {
65+
void simpleAccess03() {
6666
evaluate("stringArrayOfThreeItems.length", "3", Integer.class);
6767
}
6868

6969
@Test
70-
public void testNonExistentPropertiesAndMethods() {
70+
void nonExistentPropertiesAndMethods() {
7171
// madeup does not exist as a property
7272
evaluateAndCheckError("madeup", SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE, 0);
7373

@@ -80,21 +80,21 @@ public void testNonExistentPropertiesAndMethods() {
8080
* supplied resolver might be able to - so null shouldn't crash the reflection resolver.
8181
*/
8282
@Test
83-
public void testAccessingOnNullObject() {
84-
SpelExpression expr = (SpelExpression)parser.parseExpression("madeup");
83+
void accessingOnNullObject() {
84+
SpelExpression expr = (SpelExpression) parser.parseExpression("madeup");
8585
EvaluationContext context = new StandardEvaluationContext(null);
86-
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
87-
expr.getValue(context))
88-
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL));
86+
assertThatExceptionOfType(SpelEvaluationException.class)
87+
.isThrownBy(() -> expr.getValue(context))
88+
.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL);
8989
assertThat(expr.isWritable(context)).isFalse();
90-
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
91-
expr.setValue(context, "abc"))
92-
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL));
90+
assertThatExceptionOfType(SpelEvaluationException.class)
91+
.isThrownBy(() -> expr.setValue(context, "abc"))
92+
.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
9393
}
9494

9595
@Test
9696
// Adding a new property accessor just for a particular type
97-
public void testAddingSpecificPropertyAccessor() {
97+
void addingSpecificPropertyAccessor() {
9898
SpelExpressionParser parser = new SpelExpressionParser();
9999
StandardEvaluationContext ctx = new StandardEvaluationContext();
100100

@@ -125,35 +125,34 @@ public void testAddingSpecificPropertyAccessor() {
125125
}
126126

127127
@Test
128-
public void testAddingRemovingAccessors() {
128+
void addingAndRemovingAccessors() {
129129
StandardEvaluationContext ctx = new StandardEvaluationContext();
130130

131131
// reflective property accessor is the only one by default
132-
List<PropertyAccessor> propertyAccessors = ctx.getPropertyAccessors();
133-
assertThat(propertyAccessors.size()).isEqualTo(1);
132+
assertThat(ctx.getPropertyAccessors()).hasSize(1);
134133

135134
StringyPropertyAccessor spa = new StringyPropertyAccessor();
136135
ctx.addPropertyAccessor(spa);
137-
assertThat(ctx.getPropertyAccessors().size()).isEqualTo(2);
136+
assertThat(ctx.getPropertyAccessors()).hasSize(2);
138137

139138
List<PropertyAccessor> copy = new ArrayList<>(ctx.getPropertyAccessors());
140139
assertThat(ctx.removePropertyAccessor(spa)).isTrue();
141140
assertThat(ctx.removePropertyAccessor(spa)).isFalse();
142-
assertThat(ctx.getPropertyAccessors().size()).isEqualTo(1);
141+
assertThat(ctx.getPropertyAccessors()).hasSize(1);
143142

144143
ctx.setPropertyAccessors(copy);
145-
assertThat(ctx.getPropertyAccessors().size()).isEqualTo(2);
144+
assertThat(ctx.getPropertyAccessors()).hasSize(2);
146145
}
147146

148147
@Test
149-
public void testAccessingPropertyOfClass() {
148+
void accessingPropertyOfClass() {
150149
Expression expression = parser.parseExpression("name");
151150
Object value = expression.getValue(new StandardEvaluationContext(String.class));
152151
assertThat(value).isEqualTo("java.lang.String");
153152
}
154153

155154
@Test
156-
public void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
155+
void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
157156
SpelExpressionParser parser = new SpelExpressionParser();
158157
Expression expression = parser.parseExpression("name");
159158

@@ -167,19 +166,19 @@ public void shouldAlwaysUsePropertyAccessorFromEvaluationContext() {
167166
}
168167

169168
@Test
170-
public void standardGetClassAccess() {
169+
void standardGetClassAccess() {
171170
assertThat(parser.parseExpression("'a'.class.name").getValue()).isEqualTo(String.class.getName());
172171
}
173172

174173
@Test
175-
public void noGetClassAccess() {
174+
void noGetClassAccess() {
176175
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
177176
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
178177
parser.parseExpression("'a'.class.name").getValue(context));
179178
}
180179

181180
@Test
182-
public void propertyReadOnly() {
181+
void propertyReadOnly() {
183182
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
184183

185184
Expression expr = parser.parseExpression("name");
@@ -193,7 +192,7 @@ public void propertyReadOnly() {
193192
}
194193

195194
@Test
196-
public void propertyReadOnlyWithRecordStyle() {
195+
void propertyReadOnlyWithRecordStyle() {
197196
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
198197

199198
Expression expr = parser.parseExpression("name");
@@ -207,7 +206,7 @@ public void propertyReadOnlyWithRecordStyle() {
207206
}
208207

209208
@Test
210-
public void propertyReadWrite() {
209+
void propertyReadWrite() {
211210
EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
212211

213212
Expression expr = parser.parseExpression("name");
@@ -226,42 +225,42 @@ public void propertyReadWrite() {
226225
}
227226

228227
@Test
229-
public void propertyReadWriteWithRootObject() {
230-
Person target = new Person("p1");
231-
EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().withRootObject(target).build();
232-
assertThat(context.getRootObject().getValue()).isSameAs(target);
228+
void propertyReadWriteWithRootObject() {
229+
Person rootObject = new Person("p1");
230+
EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().withRootObject(rootObject).build();
231+
assertThat(context.getRootObject().getValue()).isSameAs(rootObject);
233232

234233
Expression expr = parser.parseExpression("name");
235234
assertThat(expr.getValue(context)).isEqualTo("p1");
236-
target.setName("p2");
235+
rootObject.setName("p2");
237236
assertThat(expr.getValue(context)).isEqualTo("p2");
238237

239-
parser.parseExpression("name='p3'").getValue(context, target);
240-
assertThat(target.getName()).isEqualTo("p3");
238+
parser.parseExpression("name='p3'").getValue(context, rootObject);
239+
assertThat(rootObject.getName()).isEqualTo("p3");
241240
assertThat(expr.getValue(context)).isEqualTo("p3");
242241

243242
expr.setValue(context, "p4");
244-
assertThat(target.getName()).isEqualTo("p4");
243+
assertThat(rootObject.getName()).isEqualTo("p4");
245244
assertThat(expr.getValue(context)).isEqualTo("p4");
246245
}
247246

248247
@Test
249-
public void propertyAccessWithoutMethodResolver() {
248+
void propertyAccessWithoutMethodResolver() {
250249
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
251250
Person target = new Person("p1");
252251
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
253252
parser.parseExpression("name.substring(1)").getValue(context, target));
254253
}
255254

256255
@Test
257-
public void propertyAccessWithInstanceMethodResolver() {
256+
void propertyAccessWithInstanceMethodResolver() {
258257
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().withInstanceMethods().build();
259258
Person target = new Person("p1");
260259
assertThat(parser.parseExpression("name.substring(1)").getValue(context, target)).isEqualTo("1");
261260
}
262261

263262
@Test
264-
public void propertyAccessWithInstanceMethodResolverAndTypedRootObject() {
263+
void propertyAccessWithInstanceMethodResolverAndTypedRootObject() {
265264
Person rootObject = new Person("p1");
266265
EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().
267266
withInstanceMethods().withTypedRootObject(rootObject, TypeDescriptor.valueOf(Object.class)).build();
@@ -277,7 +276,7 @@ void propertyAccessWithArrayIndexOutOfBounds() {
277276
Expression expression = parser.parseExpression("stringArrayOfThreeItems[3]");
278277
assertThatExceptionOfType(SpelEvaluationException.class)
279278
.isThrownBy(() -> expression.getValue(context, new Inventor()))
280-
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.ARRAY_INDEX_OUT_OF_BOUNDS));
279+
.extracting(SpelEvaluationException::getMessageCode).isEqualTo(SpelMessage.ARRAY_INDEX_OUT_OF_BOUNDS);
281280
}
282281

283282

@@ -335,7 +334,7 @@ private static class ConfigurablePropertyAccessor implements PropertyAccessor {
335334

336335
private final Map<String, Object> values;
337336

338-
public ConfigurablePropertyAccessor(Map<String, Object> values) {
337+
ConfigurablePropertyAccessor(Map<String, Object> values) {
339338
this.values = values;
340339
}
341340

0 commit comments

Comments
 (0)