DATACMNS-494 - Removed the defaulting of the environment in RepositoryBeanDefinitionRegistrarSupport.

As SPR-11744 got fixed recently and will be available in Spring 3.2.9, we removed the guard in RepositoryBeanDefinitionRegistrarSupport which defaulted the environment in case it was not set by the container.

Related tickets: SPR-11744.
This commit is contained in:
Oliver Gierke
2014-05-19 09:10:05 +02:00
parent 1d8717712c
commit b94d1fac8e
2 changed files with 15 additions and 26 deletions

View File

@@ -20,6 +20,7 @@ import static org.mockito.Mockito.*;
import java.lang.annotation.Annotation;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -34,7 +35,7 @@ import org.springframework.data.repository.core.support.RepositoryFactoryBeanSup
/**
* Integration test for {@link RepositoryBeanDefinitionRegistrarSupport}.
*
*
* @author Oliver Gierke
*/
@RunWith(MockitoJUnitRunner.class)
@@ -42,11 +43,23 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
@Mock BeanDefinitionRegistry registry;
StandardEnvironment environment;
DummyRegistrar registrar;
@Before
public void setUp() {
environment = new StandardEnvironment();
registrar = new DummyRegistrar();
registrar.setEnvironment(environment);
}
@Test
public void registersBeanDefinitionForFoundBean() {
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
DummyRegistrar registrar = new DummyRegistrar();
registrar.registerBeanDefinitions(metadata, registry);
assertBeanDefinitionRegisteredFor("myRepository");
@@ -60,8 +73,6 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
public void registeredProfileRepositoriesIfProfileActivated() {
StandardAnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
StandardEnvironment environment = new StandardEnvironment();
environment.setActiveProfiles("profile");
DummyRegistrar registrar = new DummyRegistrar();