back to jdk 1.4; removed warnings; added two way executor

This commit is contained in:
Keith Donald
2009-02-13 20:57:26 +00:00
parent bae262b84b
commit 680002fafd
5 changed files with 87 additions and 17 deletions

View File

@@ -316,7 +316,7 @@ public class DefaultConversionServiceTests extends TestCase {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
try {
ConversionExecutor executor = service.getConversionExecutor("princy", Integer.class, Principal[].class);
service.getConversionExecutor("princy", Integer.class, Principal[].class);
fail("Should have failed");
} catch (ConversionExecutorNotFoundException e) {
@@ -336,7 +336,7 @@ public class DefaultConversionServiceTests extends TestCase {
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", Integer.class, List.class);
try {
List list = (List) executor.execute(new Integer(1));
executor.execute(new Integer(1));
fail("Should have failed");
} catch (ConversionExecutionException e) {
@@ -397,7 +397,7 @@ public class DefaultConversionServiceTests extends TestCase {
List princyList = new ArrayList();
princyList.add(new Integer(1));
try {
List list = (List) executor.execute(princyList);
executor.execute(princyList);
fail("Should have failed");
} catch (ConversionExecutionException e) {

View File

@@ -42,7 +42,6 @@ public class DefaultMessageContextTests extends TestCase {
assertEquals("Hello world fallback!", messages[0].getText());
assertEquals(Severity.ERROR, messages[0].getSeverity());
assertEquals(null, messages[0].getSource());
assertTrue(context instanceof StateManageableMessageContext);
}
public void testResolveMessageWithArgs() {
@@ -53,7 +52,6 @@ public class DefaultMessageContextTests extends TestCase {
assertEquals("Hello world Keith!", messages[0].getText());
assertEquals(Severity.ERROR, messages[0].getSeverity());
assertEquals(this, messages[0].getSource());
assertTrue(context instanceof StateManageableMessageContext);
}
public void testResolveMessageWithMultipleCodes() {
@@ -64,7 +62,6 @@ public class DefaultMessageContextTests extends TestCase {
assertEquals("Hello world Keith!", messages[0].getText());
assertEquals(Severity.ERROR, messages[0].getSeverity());
assertEquals(this, messages[0].getSource());
assertTrue(context instanceof StateManageableMessageContext);
}
public void testSaveRestoreMessages() {
@@ -73,12 +70,11 @@ public class DefaultMessageContextTests extends TestCase {
context.addMessage(new MessageBuilder().warning().source(this).code("message").build());
assertEquals(2, context.getMessagesBySource(null).length);
assertEquals(1, context.getMessagesBySource(this).length);
assertTrue(context instanceof StateManageableMessageContext);
StateManageableMessageContext manageable = (StateManageableMessageContext) context;
StateManageableMessageContext manageable = context;
Serializable messages = manageable.createMessagesMemento();
context = new DefaultMessageContext(context.getMessageSource());
assertEquals(0, context.getAllMessages().length);
manageable = (StateManageableMessageContext) context;
manageable = context;
manageable.restoreMessages(messages);
assertEquals(2, context.getMessagesBySource(null).length);
assertEquals(1, context.getMessagesBySource(this).length);