Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
View File

@@ -156,19 +156,19 @@ public class ConstructorInvocationTests extends AbstractExpressionTests {
// reflective constructor accessor is the only one by default
List<ConstructorResolver> constructorResolvers = ctx.getConstructorResolvers();
assertThat(constructorResolvers.size()).isEqualTo(1);
assertThat(constructorResolvers).hasSize(1);
ConstructorResolver dummy = new DummyConstructorResolver();
ctx.addConstructorResolver(dummy);
assertThat(ctx.getConstructorResolvers().size()).isEqualTo(2);
assertThat(ctx.getConstructorResolvers()).hasSize(2);
List<ConstructorResolver> copy = new ArrayList<>(ctx.getConstructorResolvers());
assertThat(ctx.removeConstructorResolver(dummy)).isTrue();
assertThat(ctx.removeConstructorResolver(dummy)).isFalse();
assertThat(ctx.getConstructorResolvers().size()).isEqualTo(1);
assertThat(ctx.getConstructorResolvers()).hasSize(1);
ctx.setConstructorResolvers(copy);
assertThat(ctx.getConstructorResolvers().size()).isEqualTo(2);
assertThat(ctx.getConstructorResolvers()).hasSize(2);
}

10
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@@ -70,14 +70,14 @@ class EvaluationTests extends AbstractExpressionTests {
assertThat(o).isEqualTo("");
o = parser.parseExpression("list[3]").getValue(new StandardEvaluationContext(testClass));
assertThat(o).isEqualTo("");
assertThat(testClass.list.size()).isEqualTo(4);
assertThat(testClass.list).hasSize(4);
assertThatExceptionOfType(EvaluationException.class).isThrownBy(() ->
parser.parseExpression("list2[3]").getValue(new StandardEvaluationContext(testClass)));
o = parser.parseExpression("foo[3]").getValue(new StandardEvaluationContext(testClass));
assertThat(o).isEqualTo("");
assertThat(testClass.getFoo().size()).isEqualTo(4);
assertThat(testClass.getFoo()).hasSize(4);
}
@Test
@@ -319,7 +319,7 @@ class EvaluationTests extends AbstractExpressionTests {
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("listOfStrings[++index3]='def'");
e.getValue(ctx);
assertThat(instance.listOfStrings.size()).isEqualTo(2);
assertThat(instance.listOfStrings).hasSize(2);
assertThat(instance.listOfStrings.get(1)).isEqualTo("def");
// Check reference beyond end of collection
@@ -351,14 +351,14 @@ class EvaluationTests extends AbstractExpressionTests {
SpelExpressionParser parser = new SpelExpressionParser( new SpelParserConfiguration(true, true, 3));
Expression e = parser.parseExpression("foo[2]");
e.setValue(ctx, "2");
assertThat(instance.getFoo().size()).isEqualTo(3);
assertThat(instance.getFoo()).hasSize(3);
e = parser.parseExpression("foo[3]");
try {
e.setValue(ctx, "3");
}
catch (SpelEvaluationException see) {
assertThat(see.getMessageCode()).isEqualTo(SpelMessage.UNABLE_TO_GROW_COLLECTION);
assertThat(instance.getFoo().size()).isEqualTo(3);
assertThat(instance.getFoo()).hasSize(3);
}
}

8
spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
View File

@@ -220,19 +220,19 @@ public class MethodInvocationTests extends AbstractExpressionTests {
// reflective method accessor is the only one by default
List<MethodResolver> methodResolvers = ctx.getMethodResolvers();
assertThat(methodResolvers.size()).isEqualTo(1);
assertThat(methodResolvers).hasSize(1);
MethodResolver dummy = new DummyMethodResolver();
ctx.addMethodResolver(dummy);
assertThat(ctx.getMethodResolvers().size()).isEqualTo(2);
assertThat(ctx.getMethodResolvers()).hasSize(2);
List<MethodResolver> copy = new ArrayList<>(ctx.getMethodResolvers());
assertThat(ctx.removeMethodResolver(dummy)).isTrue();
assertThat(ctx.removeMethodResolver(dummy)).isFalse();
assertThat(ctx.getMethodResolvers().size()).isEqualTo(1);
assertThat(ctx.getMethodResolvers()).hasSize(1);
ctx.setMethodResolvers(copy);
assertThat(ctx.getMethodResolvers().size()).isEqualTo(2);
assertThat(ctx.getMethodResolvers()).hasSize(2);
}
@Test

4
spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java
View File

@@ -189,7 +189,7 @@ class SelectionAndProjectionTests {
Expression exp = parser.parseExpression("colors.^[key.startsWith('b')]");
Map<String, String> colorsMap = (Map<String, String>) exp.getValue(context);
assertThat(colorsMap.size()).isEqualTo(1);
assertThat(colorsMap).hasSize(1);
assertThat(colorsMap.keySet().iterator().next()).isEqualTo("beige");
}
@@ -201,7 +201,7 @@ class SelectionAndProjectionTests {
Expression exp = parser.parseExpression("colors.$[key.startsWith('b')]");
Map<String, String> colorsMap = (Map<String, String>) exp.getValue(context);
assertThat(colorsMap.size()).isEqualTo(1);
assertThat(colorsMap).hasSize(1);
assertThat(colorsMap.keySet().iterator().next()).isEqualTo("brown");
}

2
spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
View File

@@ -445,7 +445,7 @@ class SpelDocumentationTests extends AbstractExpressionTests {
StandardEvaluationContext societyContext = new StandardEvaluationContext();
societyContext.setRootObject(new IEEE());
List<Inventor> list = (List<Inventor>) parser.parseExpression("Members2.?[nationality == 'Serbian']").getValue(societyContext);
assertThat(list.size()).isEqualTo(1);
assertThat(list).hasSize(1);
assertThat(list.get(0).getName()).isEqualTo("Nikola Tesla");
}

2
spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
View File

@@ -40,7 +40,7 @@ class StandardTypeLocatorTests {
assertThat(locator.findType("java.lang.String")).isEqualTo(String.class);
List<String> prefixes = locator.getImportPrefixes();
assertThat(prefixes.size()).isEqualTo(1);
assertThat(prefixes).hasSize(1);
assertThat(prefixes.contains("java.lang")).isTrue();
assertThat(prefixes.contains("java.util")).isFalse();

6
spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
View File

@@ -59,13 +59,13 @@ public class StandardComponentsTests {
public void testStandardTypeLocator() {
StandardTypeLocator tl = new StandardTypeLocator();
List<String> prefixes = tl.getImportPrefixes();
assertThat(prefixes.size()).isEqualTo(1);
assertThat(prefixes).hasSize(1);
tl.registerImport("java.util");
prefixes = tl.getImportPrefixes();
assertThat(prefixes.size()).isEqualTo(2);
assertThat(prefixes).hasSize(2);
tl.removeImport("java.util");
prefixes = tl.getImportPrefixes();
assertThat(prefixes.size()).isEqualTo(1);
assertThat(prefixes).hasSize(1);
}
@Test