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() {

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

@@ -39,17 +39,17 @@
  */
 class JobOperatorFactoryBeanTests {
 
-	private final PlatformTransactionManager transactionManager = Mockito.mock(PlatformTransactionManager.class);
+	private final PlatformTransactionManager transactionManager = Mockito.mock();
 
-	private final JobRepository jobRepository = Mockito.mock(JobRepository.class);
+	private final JobRepository jobRepository = Mockito.mock();
 
-	private final JobLauncher jobLauncher = Mockito.mock(JobLauncher.class);
+	private final JobLauncher jobLauncher = Mockito.mock();
 
-	private final JobRegistry jobRegistry = Mockito.mock(JobRegistry.class);
+	private final JobRegistry jobRegistry = Mockito.mock();
 
-	private final JobExplorer jobExplorer = Mockito.mock(JobExplorer.class);
+	private final JobExplorer jobExplorer = Mockito.mock();
 
-	private final JobParametersConverter jobParametersConverter = Mockito.mock(JobParametersConverter.class);
+	private final JobParametersConverter jobParametersConverter = Mockito.mock();
 
 	@Test
 	public void testJobOperatorCreation() throws Exception {
@@ -76,7 +76,7 @@ public void testJobOperatorCreation() throws Exception {
 	@Test
 	public void testCustomTransactionAttributesSource() throws Exception {
 		// given
-		TransactionAttributeSource transactionAttributeSource = Mockito.mock(TransactionAttributeSource.class);
+		TransactionAttributeSource transactionAttributeSource = Mockito.mock();
 		JobOperatorFactoryBean jobOperatorFactoryBean = new JobOperatorFactoryBean();
 		jobOperatorFactoryBean.setTransactionManager(this.transactionManager);
 		jobOperatorFactoryBean.setJobLauncher(this.jobLauncher);

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

@@ -120,11 +120,11 @@ public Set<String> getJobNames() {
 		jobOperator.setJobLauncher(
 				(job, jobParameters) -> new JobExecution(new JobInstance(123L, job.getName()), 999L, jobParameters));
 
-		jobExplorer = mock(JobExplorer.class);
+		jobExplorer = mock();
 
 		jobOperator.setJobExplorer(jobExplorer);
 
-		jobRepository = mock(JobRepository.class);
+		jobRepository = mock();
 		jobOperator.setJobRepository(jobRepository);
 
 		jobOperator.setJobParametersConverter(new DefaultJobParametersConverter() {
@@ -288,7 +288,7 @@ public void testGetJobInstanceWithNameAndParameters() {
 		// given
 		String jobName = "job";
 		JobParameters jobParameters = new JobParameters();
-		JobInstance jobInstance = mock(JobInstance.class);
+		JobInstance jobInstance = mock();
 
 		// when
 		when(this.jobExplorer.getJobInstance(jobName, jobParameters)).thenReturn(jobInstance);
@@ -338,14 +338,14 @@ void testStop() throws Exception {
 	void testStopTasklet() throws Exception {
 		JobInstance jobInstance = new JobInstance(123L, job.getName());
 		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
-		StoppableTasklet tasklet = mock(StoppableTasklet.class);
+		StoppableTasklet tasklet = mock();
 		TaskletStep taskletStep = new TaskletStep();
 		taskletStep.setTasklet(tasklet);
 		MockJob job = new MockJob();
 		job.taskletStep = taskletStep;
 
-		JobRegistry jobRegistry = mock(JobRegistry.class);
-		TaskletStep step = mock(TaskletStep.class);
+		JobRegistry jobRegistry = mock();
+		TaskletStep step = mock();
 
 		when(step.getTasklet()).thenReturn(tasklet);
 		when(step.getName()).thenReturn("test_job.step1");
@@ -363,9 +363,9 @@ void testStopTasklet() throws Exception {
 	void testStopTaskletWhenJobNotRegistered() throws Exception {
 		JobInstance jobInstance = new JobInstance(123L, job.getName());
 		JobExecution jobExecution = new JobExecution(jobInstance, 111L, jobParameters);
-		StoppableTasklet tasklet = mock(StoppableTasklet.class);
-		JobRegistry jobRegistry = mock(JobRegistry.class);
-		TaskletStep step = mock(TaskletStep.class);
+		StoppableTasklet tasklet = mock();
+		JobRegistry jobRegistry = mock();
+		TaskletStep step = mock();
 
 		when(step.getTasklet()).thenReturn(tasklet);
 		when(jobRegistry.getJob(job.getName())).thenThrow(new NoSuchJobException("Unable to find job"));
@@ -399,8 +399,8 @@ public void stop() {
 		MockJob job = new MockJob();
 		job.taskletStep = taskletStep;
 
-		JobRegistry jobRegistry = mock(JobRegistry.class);
-		TaskletStep step = mock(TaskletStep.class);
+		JobRegistry jobRegistry = mock();
+		TaskletStep step = mock();
 
 		when(step.getTasklet()).thenReturn(tasklet);
 		when(step.getName()).thenReturn("test_job.step1");

spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java

@@ -39,7 +39,7 @@ class CompositeChunkListenerTests {
 	@BeforeEach
 	void setUp() {
 		chunkContext = new ChunkContext(null);
-		listener = mock(ChunkListener.class);
+		listener = mock();
 		compositeListener = new CompositeChunkListener();
 		compositeListener.register(listener);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java

@@ -37,7 +37,7 @@ class CompositeItemProcessListenerTests {
 	@SuppressWarnings("unchecked")
 	@BeforeEach
 	void setUp() {
-		listener = mock(ItemProcessListener.class);
+		listener = mock();
 		compositeListener = new CompositeItemProcessListener<>();
 		compositeListener.register(listener);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java

@@ -38,7 +38,7 @@ class CompositeItemReadListenerTests {
 	@SuppressWarnings("unchecked")
 	@BeforeEach
 	void setUp() {
-		listener = mock(ItemReadListener.class);
+		listener = mock();
 		compositeListener = new CompositeItemReadListener<>();
 		compositeListener.register(listener);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java

@@ -40,7 +40,7 @@ class CompositeItemWriteListenerTests {
 	@SuppressWarnings("unchecked")
 	@BeforeEach
 	void setUp() {
-		listener = mock(ItemWriteListener.class);
+		listener = mock();
 		compositeListener = new CompositeItemWriteListener<>();
 		compositeListener.register(listener);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java

@@ -30,7 +30,7 @@ class JdbcExecutionContextDaoTests extends AbstractExecutionContextDaoTests {
 	@Test
 	void testNullSerializer() {
 		JdbcExecutionContextDao jdbcExecutionContextDao = new JdbcExecutionContextDao();
-		jdbcExecutionContextDao.setJdbcTemplate(mock(JdbcOperations.class));
+		jdbcExecutionContextDao.setJdbcTemplate(mock());
 		Exception exception = assertThrows(IllegalArgumentException.class,
 				() -> jdbcExecutionContextDao.setSerializer(null));
 		assertEquals("Serializer must not be null", exception.getMessage());