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

Updated to remove warnings.

Browse Source
This commit is contained in:
dhgarrette
2009-04-08 14:33:54 +00:00
parent 47d4afd964
commit 9092b47fce
3 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java
View File

@@ -16,21 +16,25 @@
package org.springframework.batch.item.validator;
import junit.framework.TestCase;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
/**
* Tests for {@link SpringValidator}.
*/
public class SpringValidatorTests extends TestCase {
public class SpringValidatorTests {
SpringValidator validator = new SpringValidator();
private SpringValidator<Object> validator = new SpringValidator<Object>();
Validator mockValidator;
private Validator mockValidator;
protected void setUp() throws Exception {
@Before
public void setUp() throws Exception {
mockValidator = new MockSpringValidator();
validator.setValidator(mockValidator);
}
@@ -38,64 +42,47 @@ public class SpringValidatorTests extends TestCase {
/**
* Validator property is not set
*/
@Test(expected = IllegalArgumentException.class)
public void testNullValidator() throws Exception {
validator.setValidator(null);
try {
validator.afterPropertiesSet();
fail("null validator must cause exception");
}
catch (IllegalArgumentException e) {
// expected
}
validator.afterPropertiesSet();
}
/**
* Validator does not know how to validate object of the given class
*/
@Test(expected = ValidationException.class)
public void testValidateUnsupportedType() {
try {
validator.validate(Integer.valueOf(1)); // only strings are supported
fail("must not validate unsupported classes");
}
catch (ValidationException expected) {
assertTrue(true);
}
validator.validate(Integer.valueOf(1)); // only strings are supported
}
/**
* Typical successful validation - no exception is thrown.
*/
@Test
public void testValidateSuccessfully() {
validator.validate(MockSpringValidator.ACCEPT_VALUE);
assertTrue(true);
}
/**
* Typical failed validation - {@link ValidationException} is thrown
*/
@Test(expected = ValidationException.class)
public void testValidateFailure() {
try {
validator.validate(MockSpringValidator.REJECT_VALUE);
fail("exception should have been thrown on invalid value");
}
catch (ValidationException e) {
// expected
}
validator.validate(MockSpringValidator.REJECT_VALUE);
}
/**
* Typical failed validation - message contains the item and names of
* invalid fields.
*/
@Test
public void testValidateFailureWithFields() {
try {
validator.validate(MockSpringValidator.REJECT_MULTI_VALUE);
fail("exception should have been thrown on invalid value");
}
catch (ValidationException expected) {
// System.out.println(expected.getMessage());
assertTrue("message should contain the item#toString() value", expected.getMessage().contains(
"TestBeanToString"));
assertTrue("message should contain names of the invalid fields", expected.getMessage().contains("foo"));
@@ -103,7 +90,7 @@ public class SpringValidatorTests extends TestCase {
}
}
static class MockSpringValidator implements Validator {
private static class MockSpringValidator implements Validator {
public static final TestBean ACCEPT_VALUE = new TestBean();
public static final TestBean REJECT_VALUE = new TestBean();
@@ -132,7 +119,7 @@ public class SpringValidatorTests extends TestCase {
}
}
static class TestBean {
private static class TestBean {
private String foo;
private String bar;
@@ -158,6 +145,5 @@ public class SpringValidatorTests extends TestCase {
public String toString() {
return "TestBeanToString";
}
}
}

71
spring-batch-test/.springBeans
View File

@@ -1,29 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/resources/data-source-context.xml</config>
<config>src/test/resources/simple-job-launcher-context.xml</config>
<config>src/test/resources/org/springframework/batch/sample/config/common-context.xml</config>
<config>src/test/resources/jobs/sampleFlowJob.xml</config>
<config>src/test/resources/jobs/sampleSimpleJob.xml</config>
<config>src/test/resources/jobs/sample-steps.xml</config>
</configs>
<configSets>
<configSet>
<name><![CDATA[SampleJob]]></name>
<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
<incomplete>false</incomplete>
<configs>
<config>src/test/resources/data-source-context.xml</config>
<config>src/test/resources/org/springframework/batch/sample/config/common-context.xml</config>
<config>src/test/resources/simple-job-launcher-context.xml</config>
</configs>
</configSet>
</configSets>
</beansProjectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
<version>1</version>
<pluginVersion><![CDATA[2.2.3.RELEASE]]></pluginVersion>
<configSuffixes>
<configSuffix><![CDATA[xml]]></configSuffix>
</configSuffixes>
<enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/resources/data-source-context.xml</config>
<config>src/test/resources/simple-job-launcher-context.xml</config>
<config>src/test/resources/org/springframework/batch/sample/config/common-context.xml</config>
<config>src/test/resources/jobs/sampleFlowJob.xml</config>
<config>src/test/resources/jobs/sampleSimpleJob.xml</config>
<config>src/test/resources/jobs/sample-steps.xml</config>
</configs>
<configSets>
<configSet>
<name><![CDATA[SampleSimpleJob]]></name>
<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
<incomplete>false</incomplete>
<configs>
<config>src/test/resources/data-source-context.xml</config>
<config>src/test/resources/org/springframework/batch/sample/config/common-context.xml</config>
<config>src/test/resources/simple-job-launcher-context.xml</config>
<config>src/test/resources/jobs/sampleSimpleJob.xml</config>
<config>src/test/resources/jobs/sample-steps.xml</config>
</configs>
</configSet>
<configSet>
<name><![CDATA[SampleFlowJob]]></name>
<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
<incomplete>false</incomplete>
<configs>
<config>src/test/resources/data-source-context.xml</config>
<config>src/test/resources/jobs/sampleFlowJob.xml</config>
<config>src/test/resources/org/springframework/batch/sample/config/common-context.xml</config>
<config>src/test/resources/simple-job-launcher-context.xml</config>
</configs>
</configSet>
</configSets>
</beansProjectDescription>

1
spring-batch-test/src/test/java/org/springframework/batch/test/jmx/SimpleMessageApplicationEvent.java
View File

@@ -6,6 +6,7 @@ import org.springframework.context.ApplicationEvent;
* @author Dave Syer
*
*/
@SuppressWarnings("serial")
public class SimpleMessageApplicationEvent extends ApplicationEvent {
private String message;