From 0cbd5a3c9e4ed327bce5e4b80648b33ba7d9be9b Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Mon, 18 Feb 2008 18:07:50 +0000
Subject: [PATCH] Modified expected exception type.

---
 .../integration/adapter/MethodInvokingSourceTests.java    | 8 ++++----
 .../integration/adapter/MethodInvokingTargetTests.java    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java
index 41912c5840..7dc0bc956d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import org.junit.Test;
 
-import org.springframework.integration.message.MessageDeliveryException;
+import org.springframework.integration.MessagingException;
 
 /**
  * @author Mark Fisher
@@ -40,7 +40,7 @@ public class MethodInvokingSourceTests {
 		assertEquals("valid", result.iterator().next());
 	}
 
-	@Test(expected=MessageDeliveryException.class)
+	@Test(expected=MessagingException.class)
 	public void testNoMatchingMethodName() {
 		MethodInvokingSource<TestBean> source = new MethodInvokingSource<TestBean>();
 		source.setObject(new TestBean());
@@ -48,7 +48,7 @@ public class MethodInvokingSourceTests {
 		source.poll(5);
 	}
 
-	@Test(expected=MessageDeliveryException.class)
+	@Test(expected=MessagingException.class)
 	public void testInvalidMethodWithArg() {
 		MethodInvokingSource<TestBean> source = new MethodInvokingSource<TestBean>();
 		source.setObject(new TestBean());
@@ -56,7 +56,7 @@ public class MethodInvokingSourceTests {
 		source.poll(5);
 	}
 
-	@Test(expected=MessageDeliveryException.class)
+	@Test(expected=MessagingException.class)
 	public void testInvalidMethodWithNoReturnValue() {
 		MethodInvokingSource<TestBean> source = new MethodInvokingSource<TestBean>();
 		source.setObject(new TestBean());
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java
index f1ad085f65..be800eef5e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import org.springframework.integration.message.MessageDeliveryException;
+import org.springframework.integration.MessagingException;
 
 /**
  * @author Mark Fisher
@@ -37,7 +37,7 @@ public class MethodInvokingTargetTests {
 		assertTrue(result);
 	}
 
-	@Test(expected=MessageDeliveryException.class)
+	@Test(expected=MessagingException.class)
 	public void testInvalidMethodWithNoArgs() {
 		MethodInvokingTarget<TestSink> target = new MethodInvokingTarget<TestSink>();
 		target.setObject(new TestSink());
@@ -56,7 +56,7 @@ public class MethodInvokingTargetTests {
 		assertTrue(result);
 	}
 
-	@Test(expected=MessageDeliveryException.class)
+	@Test(expected=MessagingException.class)
 	public void testNoMatchingMethodName() {
 		MethodInvokingTarget<TestSink> target = new MethodInvokingTarget<TestSink>();
 		target.setObject(new TestSink());