BATCH-2250: Added @FixMethodOrder(MethodSorters.JVM) to override new default method sorting by JUnit 4.11

mminella · mminella · commit 0280c5845b15 · 2014-06-02T11:47:00.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -75,14 +75,14 @@ allprojects {
 		jbatchTckSpi = '1.0'
 		jettisonVersion = '1.2'
 		jtdsVersion = '1.2.4'
-		junitVersion = '4.10'
+		junitVersion = '4.11'
 		log4jVersion = '1.2.17'
 		mysqlVersion = '5.1.29'
 		mockitoVersion = '1.9.5'
 		postgresqlVersion = '9.0-801.jdbc4'
 		quartzVersion = '2.2.1'
 		servletApiVersion = '3.0.1'
-		slf4jVersion = '1.7.6'
+		slf4jVersion = '1.7.7'
 		sqlfireclientVersion = '1.0.3'
 		sqliteVersion = '3.7.2'
 		woodstoxVersion = '4.2.0'
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
@@ -15,16 +15,11 @@
  */
 package org.springframework.batch.core.step.item;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import org.junit.Before;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParametersBuilder;
@@ -41,12 +36,20 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.UnexpectedRollbackException;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 /**
  * @author Dan Garrette
  * @since 2.0.2
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
+@FixMethodOrder(MethodSorters.JVM)
 public class FaultTolerantExceptionClassesTests implements ApplicationContextAware {
 
 	@Autowired
