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

Migrate Hamcrest assertions to AssertJ

Browse Source 
Migrate all existing `assertThat(..., Matcher)` assertions to AssertJ
and add checkstyle rules to ensure they don't return.

See gh-23022
This commit is contained in:
Phillip Webb
2019-05-23 15:48:03 -07:00
parent 2294625cf0
commit 95a9d46a87
322 changed files with 4358 additions and 4814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,8 +45,6 @@ import org.springframework.expression.spel.testresources.TestPerson;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -671,14 +669,14 @@ public 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(), equalTo(3));
assertThat(instance.getFoo().size()).isEqualTo(3);
e = parser.parseExpression("foo[3]");
try {
e.setValue(ctx, "3");
}
catch (SpelEvaluationException see) {
assertEquals(SpelMessage.UNABLE_TO_GROW_COLLECTION, see.getMessageCode());
assertThat(instance.getFoo().size(), equalTo(3));
assertThat(instance.getFoo().size()).isEqualTo(3);
}
}

5
spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
View File

@@ -33,8 +33,7 @@ import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.util.StopWatch;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.lessThan;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
/**
@@ -116,7 +115,7 @@ public class MapAccessTests extends AbstractExpressionTests {
expr.getValue(context);
}
s.stop();
assertThat(s.getTotalTimeMillis(), lessThan(200L));
assertThat(s.getTotalTimeMillis()).isLessThan(200L);
}

13
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@@ -63,9 +63,6 @@ import org.springframework.util.ObjectUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -1261,10 +1258,10 @@ public class SpelReproTests extends AbstractExpressionTests {
StandardEvaluationContext context = new StandardEvaluationContext();
String fromInterface = parser.parseExpression("T(" + StaticFinalImpl1.class.getName() + ").VALUE").getValue(
context, String.class);
assertThat(fromInterface, is("interfaceValue"));
assertThat(fromInterface).isEqualTo("interfaceValue");
String fromClass = parser.parseExpression("T(" + StaticFinalImpl2.class.getName() + ").VALUE").getValue(
context, String.class);
assertThat(fromClass, is("interfaceValue"));
assertThat(fromClass).isEqualTo("interfaceValue");
}
@Test
@@ -1359,8 +1356,8 @@ public class SpelReproTests extends AbstractExpressionTests {
Spr10486 rootObject = new Spr10486();
Expression classNameExpression = parser.parseExpression("class.name");
Expression nameExpression = parser.parseExpression("name");
assertThat(classNameExpression.getValue(context, rootObject), equalTo((Object) Spr10486.class.getName()));
assertThat(nameExpression.getValue(context, rootObject), equalTo((Object) "name"));
assertThat(classNameExpression.getValue(context, rootObject)).isEqualTo(Spr10486.class.getName());
assertThat(nameExpression.getValue(context, rootObject)).isEqualTo("name");
}
@Test
@@ -1424,7 +1421,7 @@ public class SpelReproTests extends AbstractExpressionTests {
public void SPR11494() {
Expression exp = new SpelExpressionParser().parseExpression("T(java.util.Arrays).asList('a','b')");
List<String> list = (List<String>) exp.getValue();
assertThat(list.size(), is(2));
assertThat(list).hasSize(2);
}
@Test