Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue BATCH-1385: Composite elements do not honour @Order annotations

Browse Source 
http://jira.springframework.org/browse/BATCH-1385
This commit is contained in:
dsyer
2009-09-21 07:32:21 +00:00
parent 6f8f9d58be
commit eda5e09b8b
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-batch-core/src/test/java/org/springframework/batch/core/listener/OrderedCompositeTests.java
View File

@@ -15,26 +15,24 @@
*/
package org.springframework.batch.core.listener;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Iterator;
import org.junit.Test;
import org.springframework.core.Ordered;
import junit.framework.TestCase;
import org.springframework.core.annotation.Order;
/**
* @author Dave Syer
*
*/
public class OrderedCompositeTests extends TestCase {
public class OrderedCompositeTests {
private OrderedComposite<Object> list = new OrderedComposite<Object>();
/**
* Test method for
* {@link org.springframework.batch.core.listener.OrderedComposite#setItems(java.util.List)}
* .
*/
@Test
public void testSetItems() {
list.setItems(Arrays.asList(new Object[] { "1", "2" }));
Iterator<Object> iterator = list.iterator();
@@ -42,11 +40,7 @@ public class OrderedCompositeTests extends TestCase {
assertEquals("2", iterator.next());
}
/**
* Test method for
* {@link org.springframework.batch.core.listener.OrderedComposite#add(java.lang.Object)}
* .
*/
@Test
public void testAdd() {
list.setItems(Arrays.asList((Object) "1"));
list.add("3");
@@ -55,11 +49,7 @@ public class OrderedCompositeTests extends TestCase {
assertEquals("3", iterator.next());
}
/**
* Test method for
* {@link org.springframework.batch.core.listener.OrderedComposite#add(java.lang.Object)}
* .
*/
@Test
public void testAddOrdered() {
list.setItems(Arrays.asList((Object) "1"));
list.add(new Ordered() {
@@ -72,11 +62,7 @@ public class OrderedCompositeTests extends TestCase {
assertEquals("1", iterator.next());
}
/**
* Test method for
* {@link org.springframework.batch.core.listener.OrderedComposite#add(java.lang.Object)}
* .
*/
@Test
public void testAddMultipleOrdered() {
list.setItems(Arrays.asList((Object) "1"));
list.add(new Ordered() {
@@ -95,4 +81,22 @@ public class OrderedCompositeTests extends TestCase {
assertEquals("1", iterator.next());
}
@Test
public void testAddAnnotationOrdered() {
list.add(new Ordered() {
public int getOrder() {
return 1;
}
});
OrderedObject item = new OrderedObject();
list.add(item);
Iterator<Object> iterator = list.iterator();
assertEquals(item, iterator.next());
}
@Order(0)
private static class OrderedObject {
}
}