From b44c31e9974e993646461a14e6ff1f45f8750ceb Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:58:19 +0100 Subject: [PATCH] Polishing --- .../expression/spel/SpelCompilationCoverageTests.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index 9c73a74d8a6..22e9e7d3e10 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -175,7 +175,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { Map map = Map.of("a", 13, "b", 42); // Prerequisite: root type must not be public for this use case. - assertThat(Modifier.isPublic(map.getClass().getModifiers())).isFalse(); + assertNotPublic(map.getClass()); expression = parser.parseExpression(spel); Integer result = expression.getValue(map, Integer.class); @@ -549,7 +549,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { Map map = Map.of("foo", new int[] { 1, 2, 3 }); // Prerequisite: root type must not be public for this use case. - assertThat(Modifier.isPublic(map.getClass().getModifiers())).isFalse(); + assertNotPublic(map.getClass()); // map key access expression = parser.parseExpression("['foo']"); @@ -590,7 +590,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { Map map = Map.of("foo", new int[] { 1, 2, 3 }); // Prerequisite: root type must not be public for this use case. - assertThat(Modifier.isPublic(map.getClass().getModifiers())).isFalse(); + assertNotPublic(map.getClass()); // map key access expression = parser.parseExpression("['foo']"); @@ -5477,6 +5477,10 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { return parser.parseExpression(expression); } + private static void assertNotPublic(Class clazz) { + assertThat(Modifier.isPublic(clazz.getModifiers())).as("%s must be private", clazz.getName()).isFalse(); + } + // Nested types