Use assertThat from Hamcrest instead of JUnit 4

org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.

See gh-22894

Author: sbrannen

spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java

@@ -30,12 +30,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.beans.PropertyEditorRegistrar;
-import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
-import org.springframework.core.io.Resource;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 

spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java

@@ -39,6 +39,7 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.core.CollectionFactory.*;

spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java

@@ -27,6 +27,7 @@
 
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.core.GenericTypeResolver.*;

spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

@@ -53,6 +53,7 @@
 import org.springframework.core.ResolvableType.VariableResolver;
 import org.springframework.util.MultiValueMap;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.any;

spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.java

@@ -31,8 +31,8 @@
 
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 /**
  * Tests for {@link SerializableTypeWrapper}.

spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java

@@ -28,6 +28,7 @@
 import org.springframework.core.annotation.AnnotationUtilsTests.ImplicitAliasesContextConfig;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java

@@ -23,6 +23,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java

@@ -42,6 +42,7 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java

@@ -30,7 +30,7 @@
 import org.springframework.util.comparator.ComparableComparator;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for {@link ConvertingComparator}.

spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java

@@ -56,6 +56,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StopWatch;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java

@@ -23,8 +23,8 @@
 
 import org.springframework.core.convert.converter.Converter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 /**
  * Tests for {@link ByteBufferConverter}.

spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@@ -51,6 +51,7 @@
 
 import static java.util.Comparator.*;
 import static java.util.stream.Collectors.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java

@@ -33,6 +33,7 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java

@@ -23,7 +23,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit tests covering the extensibility of {@link AbstractEnvironment}.

spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java

@@ -23,6 +23,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java

@@ -23,6 +23,7 @@
 import org.springframework.mock.env.MockPropertySource;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java

@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit tests for {@link PropertySource} implementations.

spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java

@@ -26,6 +26,7 @@
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.mock.env.MockPropertySource;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java

@@ -22,7 +22,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class SimpleCommandLineParserTests {
 

spring-core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java

@@ -21,7 +21,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit tests for {@link SimpleCommandLinePropertySource}.
@@ -122,4 +122,5 @@ public void covertNonOptionArgsToStringArrayAndList() {
 		assertThat(nonOptionArgsList.get(0), equalTo("noa1"));
 		assertThat(nonOptionArgsList.get(1), equalTo("noa2"));
 	}
+
 }

spring-core/src/test/java/org/springframework/core/env/SystemEnvironmentPropertySourceTests.java

@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit tests for {@link SystemEnvironmentPropertySource}.

spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java

@@ -23,6 +23,7 @@
 
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/core/io/ResourceTests.java

@@ -33,6 +33,7 @@
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/io/support/ResourcePropertySourceTests.java

@@ -25,6 +25,7 @@
 import org.springframework.core.io.ClassPathResource;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java

@@ -25,6 +25,7 @@
 import org.springframework.util.ConcurrencyThrottleSupport;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java

@@ -19,7 +19,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Abstract base class for testing implementations of
@@ -73,4 +73,5 @@ public void againstMemberClass() {
 		String[] nestedClasses = metadata.getMemberClassNames();
 		assertThat(nestedClasses, equalTo(new String[]{}));
 	}
+
 }

spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java

@@ -39,6 +39,7 @@
 import org.springframework.stereotype.Component;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java

@@ -29,7 +29,7 @@
 import org.springframework.tests.TestGroup;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Unit tests for checking the behaviour of {@link CachingMetadataReaderFactory} under

spring-core/src/test/java/org/springframework/tests/AssumeTests.java

@@ -25,6 +25,7 @@
 
 import static java.util.stream.Collectors.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.springframework.tests.Assume.*;
 import static org.springframework.tests.TestGroup.*;

spring-core/src/test/java/org/springframework/tests/MockitoUtils.java

@@ -23,8 +23,8 @@
 import org.mockito.internal.util.MockUtil;
 import org.mockito.invocation.Invocation;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 /**
  * General test utilities for use with {@link Mockito}.

spring-core/src/test/java/org/springframework/tests/TestGroupTests.java

@@ -24,8 +24,8 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 
 /**
  * Tests for {@link TestGroup}.

spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java

@@ -41,6 +41,7 @@
 import org.springframework.util.comparator.ComparableComparator;
 import org.springframework.util.comparator.NullSafeComparator;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java

@@ -29,6 +29,7 @@
 import org.junit.rules.ExpectedException;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.springframework.util.ObjectUtils.*;
 

spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java

@@ -33,6 +33,7 @@
 import org.springframework.tests.sample.objects.TestObject;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/util/StreamUtilsTests.java

@@ -29,8 +29,8 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
 /**

spring-core/src/test/java/org/springframework/util/comparator/BooleanComparatorTests.java

@@ -21,7 +21,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for {@link BooleanComparator}.

spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java

@@ -21,7 +21,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for {@link InstanceComparator}.

spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java

@@ -24,6 +24,7 @@
 
 import org.junit.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.any;

spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java

@@ -33,7 +33,7 @@
 import org.xml.sax.XMLReader;
 import org.xmlunit.util.Predicate;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
 
 /**

spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java

@@ -27,7 +27,7 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.xmlunit.matchers.CompareMatcher.*;
 
 /**

spring-core/src/test/java/org/springframework/util/xml/ListBasedXMLEventReaderTests.java

@@ -30,6 +30,7 @@
 import org.junit.Test;
 
 import static javax.xml.stream.XMLStreamConstants.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.xmlunit.matchers.CompareMatcher.*;
 

spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java

@@ -24,7 +24,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Arjen Poutsma

spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java

@@ -30,9 +30,9 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
 
 /**

spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java

@@ -33,9 +33,9 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
 
 /**