OPEN - issue BATCH-773: Refactor and extend ExportedJobLauncher to JobOperator

Move exception classes to where they are thrown

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

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.configuration;
 
 import org.springframework.batch.core.AbstractExceptionTests;
-import org.springframework.batch.core.repository.DuplicateJobException;
+import org.springframework.batch.core.configuration.DuplicateJobException;
 
 /**
  * @author Dave Syer

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

@@ -0,0 +1,74 @@
+/*
+ * 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.support;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.configuration.JobFactory;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+public class JobFactoryRegistrationListenerTests {
+
+	private JobFactoryRegistrationListener listener = new JobFactoryRegistrationListener();
+
+	private MapJobRegistry registry = new MapJobRegistry();
+
+	/**
+	 * Test method for
+	 * {@link org.springframework.batch.core.configuration.support.JobFactoryRegistrationListener#bind(org.springframework.batch.core.configuration.JobFactory, java.util.Map)}.
+	 * @throws Exception
+	 */
+	@Test
+	public void testBind() throws Exception {
+		listener.setJobRegistry(registry);
+		listener.bind(new JobFactory() {
+			public Job createJob() {
+				return null;
+			}
+
+			public String getJobName() {
+				return "foo";
+			}
+		}, null);
+		assertEquals(1, registry.getJobNames().size());
+	}
+
+	/**
+	 * Test method for
+	 * {@link org.springframework.batch.core.configuration.support.JobFactoryRegistrationListener#unbind(org.springframework.batch.core.configuration.JobFactory, java.util.Map)}.
+	 * @throws Exception 
+	 */
+	@Test
+	public void testUnbind() throws Exception {
+		testBind();
+		listener.unbind(new JobFactory() {
+			public Job createJob() {
+				return null;
+			}
+
+			public String getJobName() {
+				return "foo";
+			}
+		}, null);
+		assertEquals(0, registry.getJobNames().size());
+	}
+
+}

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

@@ -19,11 +19,11 @@ import java.util.Collection;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor;
 import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.NoSuchJobException;
+import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

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

@@ -19,12 +19,12 @@ import java.util.Collection;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.batch.core.configuration.support.MapJobRegistry;
 import org.springframework.batch.core.configuration.support.ReferenceJobFactory;
 import org.springframework.batch.core.job.JobSupport;
-import org.springframework.batch.core.repository.DuplicateJobException;
-import org.springframework.batch.core.repository.NoSuchJobException;
+import org.springframework.batch.core.launch.NoSuchJobException;
 
 /**
  * @author Dave Syer

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

@@ -0,0 +1,61 @@
+/*
+ * 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.support;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class OsgiBundleXmlApplicationContextFactoryTests {
+	
+	private OsgiBundleXmlApplicationContextFactory factory = new OsgiBundleXmlApplicationContextFactory();
+
+	/**
+	 * Test method for {@link org.springframework.batch.core.configuration.support.OsgiBundleXmlApplicationContextFactory#setDisplayName(java.lang.String)}.
+	 */
+	@Test
+	public void testSetDisplayName() {
+		factory.setDisplayName("foo");
+		factory.setPath("classpath:"+ClassUtils.addResourcePathToPackagePath(getClass(), "trivial-context.xml"));
+		BundleContext bundleContext = createMock(BundleContext.class);
+		Bundle bundle = createNiceMock(Bundle.class);
+		expect(bundleContext.getBundle()).andReturn(bundle).anyTimes();
+		replay(bundleContext, bundle);
+		factory.setBundleContext(bundleContext);
+		// TODO: finish this...
+		// factory.createApplicationContext();
+		verify(bundleContext, bundle);
+	}
+
+	/**
+	 * Test method for {@link org.springframework.batch.core.configuration.support.OsgiBundleXmlApplicationContextFactory#setApplicationContext(org.springframework.context.ApplicationContext)}.
+	 */
+	@Test
+	public void testSetApplicationContext() {
+	}
+
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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.launch;
+
+import org.springframework.batch.core.AbstractExceptionTests;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class JobExecutionNotFailedExceptionTests extends AbstractExceptionTests {
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
+	 */
+	public Exception getException(String msg) throws Exception {
+		return new JobExecutionNotFailedException(msg);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
+	 */
+	public Exception getException(String msg, Throwable t) throws Exception {
+		return new JobExecutionNotFailedException(msg, t);
+	}
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.launch;
+
+import org.springframework.batch.core.AbstractExceptionTests;
+import org.springframework.batch.core.launch.JobInstanceAlreadyExistsException;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class JobInstanceAlreadyExistsExceptionTests extends AbstractExceptionTests {
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
+	 */
+	public Exception getException(String msg) throws Exception {
+		return new JobInstanceAlreadyExistsException(msg);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
+	 */
+	public Exception getException(String msg, Throwable t) throws Exception {
+		return new JobInstanceAlreadyExistsException(msg, t);
+	}
+
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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.launch;
+
+import org.springframework.batch.core.AbstractExceptionTests;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class JobParametersIncrementerNotFoundExceptionTests extends AbstractExceptionTests {
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
+	 */
+	public Exception getException(String msg) throws Exception {
+		return new JobParametersIncrementerNotFoundException(msg);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
+	 */
+	public Exception getException(String msg, Throwable t) throws Exception {
+		return new JobParametersIncrementerNotFoundException(msg, t);
+	}
+
+}

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

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.repository;
+package org.springframework.batch.core.launch;
 
 import org.springframework.batch.core.AbstractExceptionTests;
-import org.springframework.batch.core.repository.NoSuchJobException;
+import org.springframework.batch.core.launch.NoSuchJobException;
 
 /**
  * @author Dave Syer

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

@@ -0,0 +1,41 @@
+/*
+ * 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.launch;
+
+import org.springframework.batch.core.AbstractExceptionTests;
+import org.springframework.batch.core.launch.NoSuchJobExecutionException;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class NoSuchJobExecutionExceptionTests extends AbstractExceptionTests {
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
+	 */
+	public Exception getException(String msg) throws Exception {
+		return new NoSuchJobExecutionException(msg);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
+	 */
+	public Exception getException(String msg, Throwable t) throws Exception {
+		return new NoSuchJobExecutionException(msg, t);
+	}
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.launch;
+
+import org.springframework.batch.core.AbstractExceptionTests;
+import org.springframework.batch.core.launch.NoSuchJobInstanceException;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class NoSuchJobInstanceExceptionTests extends AbstractExceptionTests {
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String)
+	 */
+	public Exception getException(String msg) throws Exception {
+		return new NoSuchJobInstanceException(msg);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable)
+	 */
+	public Exception getException(String msg, Throwable t) throws Exception {
+		return new NoSuchJobInstanceException(msg, t);
+	}
+
+}