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

RESOLVED - BATCH-734: ItemReaders with Resource input should check for file during ItemStream#open

Browse Source
This commit is contained in:
robokaso
2008-07-21 13:13:44 +00:00
parent 05f94e5a15
commit 705bc284bf
9 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java
View File

@@ -43,7 +43,6 @@ public class MultiResourceItemReaderFlatFileTests extends
}
});
multiReader.afterPropertiesSet();
return multiReader;
}
@@ -53,9 +52,7 @@ public class MultiResourceItemReaderFlatFileTests extends
multiReader.close(new ExecutionContext());
multiReader.setResources(new Resource[] { new ByteArrayResource(""
.getBytes()) });
multiReader.afterPropertiesSet();
multiReader.open(new ExecutionContext());
}
}

1
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java
View File

@@ -45,7 +45,6 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase {
return 0; // do not change ordering
}});
tested.setResources(new Resource[] { r1, r2, r3, r4, r5 });
tested.afterPropertiesSet();
}
/**

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java
View File

@@ -56,7 +56,6 @@ public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderT
return 0; // preserve original ordering
}
});
multiReader.afterPropertiesSet();
return multiReader;
}
@@ -66,9 +65,7 @@ public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderT
multiReader.close(new ExecutionContext());
multiReader.setResources(new Resource[] { new ByteArrayResource("<foos />"
.getBytes()) });
multiReader.afterPropertiesSet();
multiReader.open(new ExecutionContext());
}
}

79
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
View File

@@ -50,20 +50,14 @@ public class StaxEventItemReaderTests extends TestCase {
}
public void testAfterPropertesSetException() throws Exception {
source.setResource(null);
try {
source.afterPropertiesSet();
fail();
} catch (IllegalArgumentException e) {
// expected;
}
source = createNewInputSouce();
source.setFragmentRootElementName("");
try {
source.afterPropertiesSet();
fail();
} catch (IllegalArgumentException e) {
}
catch (IllegalArgumentException e) {
// expected
}
@@ -72,14 +66,15 @@ public class StaxEventItemReaderTests extends TestCase {
try {
source.afterPropertiesSet();
fail();
} catch (IllegalArgumentException e) {
}
catch (IllegalArgumentException e) {
// expected
}
}
/**
* Regular usage scenario. ItemReader should pass XML fragments to deserializer wrapped with StartDocument and
* EndDocument events.
* Regular usage scenario. ItemReader should pass XML fragments to
* deserializer wrapped with StartDocument and EndDocument events.
*/
public void testFragmentWrapping() throws Exception {
source.afterPropertiesSet();
@@ -125,21 +120,24 @@ public class StaxEventItemReaderTests extends TestCase {
assertEquals(expectedAfterRestart.size(), afterRestart.size());
}
// /**
// * Restore point must not exceed end of file, input source must not be already initialised when restoring.
// */
// public void testInvalidRestore() {
// ExecutionContext context = new ExecutionContext();
// context.putLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".item.count", 100000);
// try {
// source.open(context);
// fail("Expected StreamException");
// } catch (Exception e) {
// // expected
// String message = e.getMessage();
// assertTrue("Wrong message: " + message, contains(message, "must be before"));
// }
// }
// /**
// * Restore point must not exceed end of file, input source must not be
// already initialised when restoring.
// */
// public void testInvalidRestore() {
// ExecutionContext context = new ExecutionContext();
// context.putLong(ClassUtils.getShortName(StaxEventItemReader.class) +
// ".item.count", 100000);
// try {
// source.open(context);
// fail("Expected StreamException");
// } catch (Exception e) {
// // expected
// String message = e.getMessage();
// assertTrue("Wrong message: " + message, contains(message,
// "must be before"));
// }
// }
public void testRestoreWorksFromClosedStream() throws Exception {
source.close(executionContext);
@@ -149,7 +147,7 @@ public class StaxEventItemReaderTests extends TestCase {
/**
* Rollback to last commited record.
*/
public void testRollback() throws Exception{
public void testRollback() throws Exception {
source.open(executionContext);
// rollback between deserializing records
List<XMLEvent> first = source.read();
@@ -163,9 +161,10 @@ public class StaxEventItemReaderTests extends TestCase {
}
/**
* Statistics return the current record count. Calling read after end of input does not increase the counter.
* Statistics return the current record count. Calling read after end of
* input does not increase the counter.
*/
public void testExecutionContext() throws Exception{
public void testExecutionContext() throws Exception {
final int NUMBER_OF_RECORDS = 2;
source.open(executionContext);
source.update(executionContext);
@@ -211,7 +210,8 @@ public class StaxEventItemReaderTests extends TestCase {
try {
newSource.read();
fail("Expected ReaderNotOpenException");
} catch (Exception e) {
}
catch (Exception e) {
// expected
}
}
@@ -234,7 +234,8 @@ public class StaxEventItemReaderTests extends TestCase {
try {
source.open(executionContext);
} catch (ItemStreamException ex) {
}
catch (ItemStreamException ex) {
// expected
}
@@ -248,7 +249,8 @@ public class StaxEventItemReaderTests extends TestCase {
try {
source.open(executionContext);
fail();
} catch (ItemStreamException ex) {
}
catch (ItemStreamException ex) {
// expected
}
}
@@ -277,13 +279,15 @@ public class StaxEventItemReaderTests extends TestCase {
}
/**
* A simple XMLEvent deserializer mock - check for the start and end document events for the fragment root & end
* tags + skips the fragment contents.
* A simple XMLEvent deserializer mock - check for the start and end
* document events for the fragment root & end tags + skips the fragment
* contents.
*/
private static class MockFragmentDeserializer implements EventReaderDeserializer<List<XMLEvent>> {
/**
* A simple mapFragment implementation checking the StaxEventReaderItemReader basic read functionality.
* A simple mapFragment implementation checking the
* StaxEventReaderItemReader basic read functionality.
*
* @param eventReader
* @return list of the events from fragment body
@@ -312,7 +316,8 @@ public class StaxEventItemReaderTests extends TestCase {
XMLEvent event4 = eventReader.nextEvent();
assertTrue(event4.isEndDocument());
} catch (XMLStreamException e) {
}
catch (XMLStreamException e) {
throw new RuntimeException("Error occured in FragmentDeserializer", e);
}
return fragmentContent;
@@ -327,7 +332,7 @@ public class StaxEventItemReaderTests extends TestCase {
do {
eventInsideFragment = eventReader.peek();
if (eventInsideFragment instanceof EndElement
&& ((EndElement) eventInsideFragment).getName().getLocalPart().equals(FRAGMENT_ROOT_ELEMENT)) {
&& ((EndElement) eventInsideFragment).getName().getLocalPart().equals(FRAGMENT_ROOT_ELEMENT)) {
break;
}
events.add(eventReader.nextEvent());