BATCH-1475: Moved job parameters validator to a nested element
This commit is contained in:
dsyer
@@ -19,41 +19,60 @@ import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.aop.framework.Advised;
|
||||
import org.springframework.batch.core.Job;
|
||||
import org.springframework.batch.core.JobExecutionListener;
|
||||
import org.springframework.batch.core.job.AbstractJob;
|
||||
import org.springframework.batch.core.job.DefaultJobParametersValidator;
|
||||
import org.springframework.batch.core.listener.JobExecutionListenerSupport;
|
||||
import org.springframework.batch.core.repository.JobRepository;
|
||||
import org.springframework.batch.core.repository.support.SimpleJobRepository;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
/**
|
||||
* @author Dan Garrette
|
||||
* @author Dave Syer
|
||||
* @since 2.0
|
||||
*/
|
||||
public class JobParserTests {
|
||||
@ContextConfiguration
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class JobParserParentAttributeTests {
|
||||
|
||||
private static ConfigurableApplicationContext jobParserParentAttributeTestsCtx;
|
||||
|
||||
@BeforeClass
|
||||
public static void loadAppCtx() {
|
||||
jobParserParentAttributeTestsCtx = new ClassPathXmlApplicationContext(
|
||||
"org/springframework/batch/core/configuration/xml/JobParserParentAttributeTests-context.xml");
|
||||
}
|
||||
@Autowired
|
||||
@Qualifier("listenerClearingJob")
|
||||
private Job listenerClearingJob;
|
||||
@Autowired
|
||||
@Qualifier("defaultRepoJob")
|
||||
private Job defaultRepoJob;
|
||||
@Autowired
|
||||
@Qualifier("specifiedRepoJob")
|
||||
private Job specifiedRepoJob;
|
||||
@Autowired
|
||||
@Qualifier("inheritSpecifiedRepoJob")
|
||||
private Job inheritSpecifiedRepoJob;
|
||||
@Autowired
|
||||
@Qualifier("overrideInheritedRepoJob")
|
||||
private Job overrideInheritedRepoJob;
|
||||
@Autowired
|
||||
@Qualifier("job3")
|
||||
private Job job3;
|
||||
@Autowired
|
||||
@Qualifier("job2")
|
||||
private Job job2;
|
||||
@Autowired
|
||||
@Qualifier("job1")
|
||||
private Job job1;
|
||||
|
||||
@Test
|
||||
public void testInheritListeners() throws Exception {
|
||||
List<?> job1Listeners = getListeners("job1", jobParserParentAttributeTestsCtx);
|
||||
List<?> job1Listeners = getListeners(job1);
|
||||
assertEquals(2, job1Listeners.size());
|
||||
boolean a = false;
|
||||
boolean b = false;
|
||||
@@ -71,7 +90,7 @@ public class JobParserTests {
|
||||
|
||||
@Test
|
||||
public void testInheritListeners_NoMerge() throws Exception {
|
||||
List<?> job2Listeners = getListeners("job2", jobParserParentAttributeTestsCtx);
|
||||
List<?> job2Listeners = getListeners(job2);
|
||||
assertEquals(1, job2Listeners.size());
|
||||
boolean c = false;
|
||||
for (Object l : job2Listeners) {
|
||||
@@ -84,7 +103,7 @@ public class JobParserTests {
|
||||
|
||||
@Test
|
||||
public void testStandaloneListener() throws Exception {
|
||||
List<?> jobListeners = getListeners("job3", jobParserParentAttributeTestsCtx);
|
||||
List<?> jobListeners = getListeners(job3);
|
||||
assertEquals(2, jobListeners.size());
|
||||
boolean a = false;
|
||||
boolean b = false;
|
||||
@@ -100,10 +119,31 @@ public class JobParserTests {
|
||||
assertTrue(b);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testJobRepositoryDefaults() throws Exception {
|
||||
assertTrue(getJobRepository(defaultRepoJob) instanceof SimpleJobRepository);
|
||||
assertTrue(getJobRepository(specifiedRepoJob) instanceof DummyJobRepository);
|
||||
assertTrue(getJobRepository(inheritSpecifiedRepoJob) instanceof DummyJobRepository);
|
||||
assertTrue(getJobRepository(overrideInheritedRepoJob) instanceof SimpleJobRepository);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testListenerClearingJob() throws Exception {
|
||||
assertEquals(0, getListeners(listenerClearingJob).size());
|
||||
}
|
||||
|
||||
private JobRepository getJobRepository(Job job) throws Exception {
|
||||
assertTrue(job instanceof AbstractJob);
|
||||
Object jobRepository = ReflectionTestUtils.getField(job, "jobRepository");
|
||||
while (jobRepository instanceof Advised) {
|
||||
jobRepository = ((Advised) jobRepository).getTargetSource().getTarget();
|
||||
}
|
||||
assertTrue(jobRepository instanceof JobRepository);
|
||||
return (JobRepository) jobRepository;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<?> getListeners(String jobName, ApplicationContext ctx) throws Exception {
|
||||
assertTrue(ctx.containsBean(jobName));
|
||||
Job job = (Job) ctx.getBean(jobName);
|
||||
private List<?> getListeners(Job job) throws Exception {
|
||||
|
||||
assertTrue(job instanceof AbstractJob);
|
||||
Object compositeListener = ReflectionTestUtils.getField(job, "listener");
|
||||
@@ -118,48 +158,7 @@ public class JobParserTests {
|
||||
listeners.add(listener);
|
||||
}
|
||||
return listeners;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testJobRepositoryDefaults() throws Exception {
|
||||
ApplicationContext ctx = jobParserParentAttributeTestsCtx;
|
||||
|
||||
assertTrue(getJobRepository("defaultRepoJob", ctx) instanceof SimpleJobRepository);
|
||||
|
||||
assertTrue(getJobRepository("specifiedRepoJob", ctx) instanceof DummyJobRepository);
|
||||
|
||||
assertTrue(getJobRepository("inheritSpecifiedRepoJob", ctx) instanceof DummyJobRepository);
|
||||
|
||||
assertTrue(getJobRepository("overrideInheritedRepoJob", ctx) instanceof SimpleJobRepository);
|
||||
}
|
||||
|
||||
private JobRepository getJobRepository(String jobName, ApplicationContext ctx) throws Exception {
|
||||
assertTrue(ctx.containsBean(jobName));
|
||||
Job job = (Job) ctx.getBean(jobName);
|
||||
assertTrue(job instanceof AbstractJob);
|
||||
Object jobRepository = ReflectionTestUtils.getField(job, "jobRepository");
|
||||
while (jobRepository instanceof Advised) {
|
||||
jobRepository = ((Advised) jobRepository).getTargetSource().getTarget();
|
||||
}
|
||||
assertTrue(jobRepository instanceof JobRepository);
|
||||
return (JobRepository) jobRepository;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParametersValidator() {
|
||||
ApplicationContext ctx = jobParserParentAttributeTestsCtx;
|
||||
Job job = (Job) ctx.getBean("jobWithParametersValidator");
|
||||
assertTrue(job instanceof AbstractJob);
|
||||
Object validator = ReflectionTestUtils.getField(job, "jobParametersValidator");
|
||||
assertTrue(validator instanceof DefaultJobParametersValidator);
|
||||
@SuppressWarnings("unchecked")
|
||||
Collection<String> keys = (Collection<String>) ReflectionTestUtils.getField(validator, "requiredKeys");
|
||||
assertEquals(2, keys.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testListenerClearingJob() throws Exception {
|
||||
assertEquals(0, getListeners("listenerClearingJob", jobParserParentAttributeTestsCtx).size());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
* Copyright 2006-2007 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.batch.core.configuration.xml;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.batch.core.Job;
|
||||
import org.springframework.batch.core.JobParameters;
|
||||
import org.springframework.batch.core.JobParametersInvalidException;
|
||||
import org.springframework.batch.core.job.AbstractJob;
|
||||
import org.springframework.batch.core.job.DefaultJobParametersValidator;
|
||||
import org.springframework.batch.core.job.JobParametersValidator;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
/**
|
||||
* @author Dave Syer
|
||||
*
|
||||
*/
|
||||
@ContextConfiguration
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class JobParserValidatorTests {
|
||||
|
||||
@Autowired
|
||||
@Qualifier("job1")
|
||||
private Job job1;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("job2")
|
||||
private Job job2;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("job3")
|
||||
private Job job3;
|
||||
|
||||
@Test(expected=JobParametersInvalidException.class)
|
||||
public void testValidatorAttribute() throws Exception {
|
||||
assertNotNull(job1);
|
||||
JobParametersValidator validator = (JobParametersValidator) ReflectionTestUtils.getField(job1,
|
||||
"jobParametersValidator");
|
||||
assertNotNull(validator);
|
||||
validator.validate(new JobParameters());
|
||||
}
|
||||
|
||||
@Test(expected=JobParametersInvalidException.class)
|
||||
public void testValidatorRef() throws Exception {
|
||||
assertNotNull(job2);
|
||||
JobParametersValidator validator = (JobParametersValidator) ReflectionTestUtils.getField(job2,
|
||||
"jobParametersValidator");
|
||||
assertNotNull(validator);
|
||||
validator.validate(new JobParameters());
|
||||
}
|
||||
|
||||
@Test(expected=JobParametersInvalidException.class)
|
||||
public void testValidatorBean() throws Exception {
|
||||
assertNotNull(job3);
|
||||
JobParametersValidator validator = (JobParametersValidator) ReflectionTestUtils.getField(job3,
|
||||
"jobParametersValidator");
|
||||
assertNotNull(validator);
|
||||
validator.validate(new JobParameters());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParametersValidator() {
|
||||
assertTrue(job1 instanceof AbstractJob);
|
||||
Object validator = ReflectionTestUtils.getField(job1, "jobParametersValidator");
|
||||
assertTrue(validator instanceof DefaultJobParametersValidator);
|
||||
@SuppressWarnings("unchecked")
|
||||
Collection<String> keys = (Collection<String>) ReflectionTestUtils.getField(validator, "requiredKeys");
|
||||
assertEquals(2, keys.size());
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user