Refine contribution #3962

- Fix failing tests
- Update year in license headers

Related to #3838

spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextCustomizerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.test.context.MergedContextConfiguration;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Mahmoud Ben Hassine
@@ -57,6 +58,6 @@ public class BatchTestContextCustomizerTest {
 				() -> this.contextCustomizer.customizeContext(context, mergedConfig));
 
 		// then
-		assertEquals("The bean factory must be an instance of BeanDefinitionRegistry", expectedException.getMessage());
+		assertThat(expectedException.getMessage(), containsString("The bean factory must be an instance of BeanDefinitionRegistry"));
 	}
 }