From 4018c30f7d7c193b07432953007cfca62d49f9d0 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 15 Aug 2013 16:58:23 -0400
Subject: [PATCH] INT-3064 removed 2 obsolete tests

---
 .../core/MessageIdGenerationTests.java        | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
index 04f64c39ef..8ab80bad87 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java
@@ -27,7 +27,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.integration.MessageChannel;
@@ -141,49 +140,6 @@ public class MessageIdGenerationTests {
 		this.assertDestroy();
 	}
 
-	// should fail because both parent and child define IdGenerator instances
-	@Test(expected=BeanDefinitionStoreException.class)
-	public void testCustomIdGenerationWithParentChildIndependentCreation() throws Exception{
-		ClassPathXmlApplicationContext parent = new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", this.getClass());
-
-		GenericXmlApplicationContext child = new GenericXmlApplicationContext();
-		try {
-			child.load("classpath:/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml");
-			child.setParent(parent);
-			child.refresh();
-		}
-		finally {
-			child.close();
-			parent.close();
-			this.assertDestroy();
-		}
-	}
-
-	// should fail because second child attempts to register another instance of IdGenerator
-	@Test(expected=BeanDefinitionStoreException.class)
-	public void testCustomIdGenerationWithParentChildIndependentCreationChildrenRegistrars() throws Exception{
-		ClassPathXmlApplicationContext parent = new ClassPathXmlApplicationContext("MessageIdGenerationTests-context.xml", this.getClass());
-
-		GenericXmlApplicationContext childA = new GenericXmlApplicationContext();
-		GenericXmlApplicationContext childB = new GenericXmlApplicationContext();
-
-		try {
-			childA.load("classpath:/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml");
-			childA.setParent(parent);
-			childA.refresh();
-
-			childB.load("classpath:/org/springframework/integration/core/MessageIdGenerationTests-context-withGenerator.xml");
-			childB.setParent(parent);
-			childB.refresh();
-		}
-		finally {
-			childA.close();
-			childB.close();
-			parent.close();
-			this.assertDestroy();
-		}
-	}
-
 	@Test
 	@Ignore
 	public void performanceTest(){