diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 4e6150a9..b1902894 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/CachingDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -106,8 +106,11 @@ public class CachingDefinedRegionTemplateAutoConfigurationIntegrationTests exten .collect(Collectors.toList())).containsExactly("BooksByAuthor", "BooksByYear", "CachedBooks"); assertThat(this.booksByAuthor).isNotNull(); + assertThat(this.booksByAuthor.getName()).isEqualTo("BooksByAuthor"); assertThat(this.booksByTitle).isNotNull(); + assertThat(this.booksByTitle.getName()).isEqualTo("CachedBooks"); assertThat(this.booksByYear).isNotNull(); + assertThat(this.booksByYear.getName()).isEqualTo("BooksByYear"); } @Test @@ -131,18 +134,21 @@ public class CachingDefinedRegionTemplateAutoConfigurationIntegrationTests exten assertThat(this.booksByYearTemplate.getRegion()).isEqualTo(this.booksByYear); } - @EnableGemFireMockObjects - @EnableCachingDefinedRegions(clientRegionShortcut = ClientRegionShortcut.LOCAL) @SpringBootApplication(scanBasePackageClasses = { NonBeanType.class, LibraryService.class }) - static class TestApplicationConfiguration { + @EnableCachingDefinedRegions(clientRegionShortcut = ClientRegionShortcut.LOCAL) + @EnableGemFireMockObjects + static class TestConfiguration { @Bean LibraryService libraryService() { return new LibraryService(); } + // TODO: Cannot autowire/inject the "booksByAuthorTemplate" GemfireTemplate bean since the "BooksByAuthor" + // Region does not yet exist when processing the Java-based Spring configuration given the nature of + // the EnableCachingDefinedRegions annotation configuration bean creation. //@Bean("TestBean") - Object testBean(@Qualifier("booksByAuthor") GemfireTemplate booksByAuthorTemplate) { + Object testBean(@Qualifier("booksByAuthorTemplate") GemfireTemplate booksByAuthorTemplate) { return "TEST"; } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java index 711b88c4..c48b0fe4 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredNonInjectedRegionTemplateAutoConfigurationIntegrationTests.java @@ -43,7 +43,8 @@ import org.springframework.test.context.junit4.SpringRunner; * Integration Tests for {@link RegionTemplateAutoConfiguration}. * * This Integration Test class tests that the {@link GemfireTemplate} is created regardless of whether - * the {@literal Example} client {@link Region} bean is actually referenced (injected) into application code. + * the {@literal Example} client {@link Region} bean is actually referenced (autowired/injected) into + * application code. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java index f40254f4..54e195f9 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/DeclaredRegionTemplateAutoConfigurationIntegrationTests.java @@ -85,7 +85,7 @@ public class DeclaredRegionTemplateAutoConfigurationIntegrationTests extends Int @SpringBootApplication @EnableGemFireMockObjects - static class TestGemFireConfiguration { + static class TestConfiguration { @Bean("Example") ClientRegionFactoryBean exampleRegion(GemFireCache gemfireCache) { @@ -97,5 +97,10 @@ public class DeclaredRegionTemplateAutoConfigurationIntegrationTests extends Int return exampleRegion; } + + @Bean("TestBean") + public Object testBean(@Qualifier("exampleTemplate") GemfireTemplate exampleTemplate) { + return "TEST"; + } } } diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 2b8f92bc..a000683e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/EntityDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -98,7 +98,9 @@ public class EntityDefinedRegionTemplateAutoConfigurationIntegrationTests extend .collect(Collectors.toList())).containsExactly("Authors", "Books"); assertThat(this.authors).isNotNull(); + assertThat(this.authors.getName()).isEqualTo("Authors"); assertThat(this.books).isNotNull(); + assertThat(this.books.getName()).isEqualTo("Books"); } @Test @@ -118,7 +120,7 @@ public class EntityDefinedRegionTemplateAutoConfigurationIntegrationTests extend @SpringBootApplication @EnableGemFireMockObjects @EnableEntityDefinedRegions(basePackageClasses = Book.class, clientRegionShortcut = ClientRegionShortcut.LOCAL) - static class TestApplicationConfiguration { + static class TestConfiguration { @Bean("TestBean") Object testBean(@Qualifier("booksTemplate") GemfireTemplate booksTemplate) { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java index c9254108..f1258b21 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByNameAutoConfigurationIntegrationTests.java @@ -83,7 +83,6 @@ public class ExistingRegionTemplateByNameAutoConfigurationIntegrationTests exten ClientRegionFactoryBean exampleRegion = new ClientRegionFactoryBean<>(); exampleRegion.setCache(gemfireCache); - exampleRegion.setClose(false); exampleRegion.setShortcut(ClientRegionShortcut.LOCAL); return exampleRegion; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java index 81d628fe..c71cbb55 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests.java @@ -37,6 +37,7 @@ import org.springframework.data.gemfire.client.ClientRegionFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration; +import org.springframework.geode.core.util.SpringExtensions; import org.springframework.test.context.junit4.SpringRunner; /** @@ -69,11 +70,19 @@ public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests ext @Resource(name = "Example") private Region example; + private void printBeanDefinitionMetadata(String beanName) { + + System.err.printf("BEAN DEFINITION METADATA [%s]%n", + SpringExtensions.getBeanDefinitionMetadata("exampleTemplate", this.applicationContext)); + } + @Test - public void exampleTemplateIsPresentButIsNotGemfireTemplate() { + public void exampleTemplateIsPresentButIsNotAGemfireTemplate() { assertThat(this.applicationContext.containsBean("exampleTemplate")).isTrue(); assertThat(this.applicationContext.getBean("exampleTemplate")).isNotInstanceOf(GemfireTemplate.class); + + //printBeanDefinitionMetadata("exampleTemplate"); } @Test @@ -84,6 +93,7 @@ public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests ext @Test public void testTemplateIsPresent() { + assertThat(this.example).isNotNull(); assertThat(this.testTemplate).isNotNull(); assertThat(this.testTemplate.getRegion()).isEqualTo(this.example); } @@ -98,7 +108,6 @@ public class ExistingRegionTemplateByRegionAutoConfigurationIntegrationTests ext ClientRegionFactoryBean clientRegion = new ClientRegionFactoryBean<>(); clientRegion.setCache(gemfireCache); - clientRegion.setClose(false); clientRegion.setShortcut(ClientRegionShortcut.LOCAL); return clientRegion; diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 5b1bc667..45a50137 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/ServerDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -147,7 +147,6 @@ public class ServerDefinedRegionTemplateAutoConfigurationIntegrationTests LocalRegionFactoryBean exampleServerRegion = new LocalRegionFactoryBean<>(); exampleServerRegion.setCache(gemfireCache); - exampleServerRegion.setClose(false); exampleServerRegion.setPersistent(false); return exampleServerRegion;