Auto-detect the class/interface to be mocked

Issue #4426

Author: lsq27

spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java

@@ -61,7 +61,7 @@ class JobParametersBuilderTests {
 	@BeforeEach
 	void initialize() {
 		this.job = new SimpleJob("simpleJob");
-		this.jobExplorer = mock(JobExplorer.class);
+		this.jobExplorer = mock();
 		this.jobInstanceList = new ArrayList<>(1);
 		this.jobExecutionList = new ArrayList<>(1);
 		this.parametersBuilder = new JobParametersBuilder(this.jobExplorer);

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java

@@ -179,7 +179,7 @@ public static class JobConfigurationWithoutTransactionManager {
 
 		@Bean
 		public DataSource dataSource() {
-			return Mockito.mock(DataSource.class);
+			return Mockito.mock();
 		}
 
 	}
@@ -190,27 +190,27 @@ public static class JobConfigurationWithUserDefinedInfrastructureBeans {
 
 		@Bean
 		public JobRepository jobRepository() {
-			return Mockito.mock(JobRepository.class);
+			return Mockito.mock();
 		}
 
 		@Bean
 		public JobExplorer jobExplorer() {
-			return Mockito.mock(JobExplorer.class);
+			return Mockito.mock();
 		}
 
 		@Bean
 		public JobLauncher jobLauncher() {
-			return Mockito.mock(JobLauncher.class);
+			return Mockito.mock();
 		}
 
 		@Bean
 		public JobRegistry jobRegistry() {
-			return Mockito.mock(JobRegistry.class);
+			return Mockito.mock();
 		}
 
 		@Bean
 		public JobOperator jobOperator() {
-			return Mockito.mock(JobOperator.class);
+			return Mockito.mock();
 		}
 
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrarTests.java

@@ -183,7 +183,7 @@ void testStartStopRunning() {
 	@Test
 	void testStartStopRunningWithCallback() {
 
-		Runnable callback = Mockito.mock(Runnable.class);
+		Runnable callback = Mockito.mock();
 		Resource[] jobPaths = new Resource[] {
 				new ClassPathResource("org/springframework/batch/core/launch/support/2jobs.xml") };
 		setUpApplicationContextFactories(jobPaths, null);

spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java

@@ -54,8 +54,8 @@ class JobExplorerFactoryBeanTests {
 	void setUp() {
 
 		factory = new JobExplorerFactoryBean();
-		DataSource dataSource = mock(DataSource.class);
-		PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
+		DataSource dataSource = mock();
+		PlatformTransactionManager transactionManager = mock();
 		factory.setDataSource(dataSource);
 		factory.setTransactionManager(transactionManager);
 		factory.setTablePrefix(tablePrefix);
@@ -73,7 +73,7 @@ void testDefaultJdbcOperations() throws Exception {
 	@Test
 	void testCustomJdbcOperations() throws Exception {
 
-		JdbcOperations customJdbcOperations = mock(JdbcOperations.class);
+		JdbcOperations customJdbcOperations = mock();
 		factory.setJdbcOperations(customJdbcOperations);
 		factory.afterPropertiesSet();
 		assertEquals(customJdbcOperations, ReflectionTestUtils.getField(factory, "jdbcOperations"));
@@ -111,7 +111,7 @@ void testCreateExplorer() throws Exception {
 	@Test
 	public void testCustomTransactionAttributesSource() throws Exception {
 		// given
-		TransactionAttributeSource transactionAttributeSource = Mockito.mock(TransactionAttributeSource.class);
+		TransactionAttributeSource transactionAttributeSource = Mockito.mock();
 		this.factory.setTransactionAttributeSource(transactionAttributeSource);
 		this.factory.afterPropertiesSet();
 

spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerTests.java

@@ -65,10 +65,10 @@ class SimpleJobExplorerTests {
 	@BeforeEach
 	void setUp() {
 
-		jobExecutionDao = mock(JobExecutionDao.class);
-		jobInstanceDao = mock(JobInstanceDao.class);
-		stepExecutionDao = mock(StepExecutionDao.class);
-		ecDao = mock(ExecutionContextDao.class);
+		jobExecutionDao = mock();
+		jobInstanceDao = mock();
+		stepExecutionDao = mock();
+		ecDao = mock();
 
 		jobExplorer = new SimpleJobExplorer(jobInstanceDao, jobExecutionDao, stepExecutionDao, ecDao);
 

spring-batch-core/src/test/java/org/springframework/batch/core/job/CompositeJobParametersValidatorTests.java

@@ -52,15 +52,15 @@ void testValidatorsCanNotBeEmpty() {
 
 	@Test
 	void testDelegateIsInvoked() throws JobParametersInvalidException {
-		JobParametersValidator validator = mock(JobParametersValidator.class);
+		JobParametersValidator validator = mock();
 		validator.validate(parameters);
 		compositeJobParametersValidator.setValidators(Arrays.asList(validator));
 		compositeJobParametersValidator.validate(parameters);
 	}
 
 	@Test
 	void testDelegatesAreInvoked() throws JobParametersInvalidException {
-		JobParametersValidator validator = mock(JobParametersValidator.class);
+		JobParametersValidator validator = mock();
 		validator.validate(parameters);
 		validator.validate(parameters);
 		compositeJobParametersValidator.setValidators(Arrays.asList(validator, validator));

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java

@@ -416,7 +416,7 @@ void testRestart() throws Exception {
 	void testInterruptWithListener() {
 		step1.setProcessException(new JobInterruptedException("job interrupted!"));
 
-		JobExecutionListener listener = mock(JobExecutionListener.class);
+		JobExecutionListener listener = mock();
 		listener.beforeJob(jobExecution);
 		listener.afterJob(jobExecution);
 

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/SplitStateTests.java

@@ -43,8 +43,8 @@ class SplitStateTests {
 	void testBasicHandling() throws Exception {
 
 		Collection<Flow> flows = new ArrayList<>();
-		Flow flow1 = mock(Flow.class);
-		Flow flow2 = mock(Flow.class);
+		Flow flow1 = mock();
+		Flow flow2 = mock();
 		flows.add(flow1);
 		flows.add(flow2);
 
@@ -61,8 +61,8 @@ void testBasicHandling() throws Exception {
 	@Test
 	void testConcurrentHandling() throws Exception {
 
-		Flow flow1 = mock(Flow.class);
-		Flow flow2 = mock(Flow.class);
+		Flow flow1 = mock();
+		Flow flow2 = mock();
 
 		SplitState state = new SplitState(Arrays.asList(flow1, flow2), "foo");
 		state.setTaskExecutor(new SimpleAsyncTaskExecutor());

spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java

@@ -72,7 +72,7 @@ public void execute(JobExecution execution) {
 	void setUp() {
 
 		jobLauncher = new TaskExecutorJobLauncher();
-		jobRepository = mock(JobRepository.class);
+		jobRepository = mock();
 		jobLauncher.setJobRepository(jobRepository);
 
 	}
@@ -265,13 +265,13 @@ void testRunStepStatusStopping() {
 
 	private void testRestartStepExecutionInvalidStatus(BatchStatus status) throws Exception {
 		String jobName = "test_job";
-		JobRepository jobRepository = mock(JobRepository.class);
+		JobRepository jobRepository = mock();
 		JobParameters parameters = new JobParametersBuilder().addLong("runtime", System.currentTimeMillis())
 			.toJobParameters();
-		JobExecution jobExecution = mock(JobExecution.class);
-		Job job = mock(Job.class);
-		JobParametersValidator validator = mock(JobParametersValidator.class);
-		StepExecution stepExecution = mock(StepExecution.class);
+		JobExecution jobExecution = mock();
+		Job job = mock();
+		JobParametersValidator validator = mock();
+		StepExecution stepExecution = mock();
 
 		when(job.getName()).thenReturn(jobName);
 		when(job.isRestartable()).thenReturn(true);

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementerTests.java

@@ -31,7 +31,7 @@
  */
 class DataFieldMaxValueJobParametersIncrementerTests {
 
-	private final DataFieldMaxValueIncrementer incrementer = mock(DataFieldMaxValueIncrementer.class);
+	private final DataFieldMaxValueIncrementer incrementer = mock();
 
 	@Test
 	void testInvalidKey() {