From 97998416f522fbd25493c27d8127dca477dc9899 Mon Sep 17 00:00:00 2001 From: Sebastian Laskawiec Date: Wed, 15 Feb 2017 11:33:57 +0100 Subject: [PATCH] Updated deprecated classes --- ...onfigurationIntegrationConfigurerTest.java | 4 +- ...eddedAutoConfigurationIntegrationTest.java | 54 +++++++++---------- ...beddedAutoConfigurationPropertiesTest.java | 4 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationConfigurerTest.java b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationConfigurerTest.java index cafd128..d8395cd 100644 --- a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationConfigurerTest.java +++ b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationConfigurerTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import infinispan.autoconfigure.embedded.InfinispanEmbeddedAutoConfiguration; @@ -19,7 +19,7 @@ import test.infinispan.autoconfigure.testconfiguration.InfinispanCacheTestConfiguration; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = {InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class +@SpringBootTest(classes = {InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class , InfinispanCacheTestConfiguration.class}) public class InfinispanEmbeddedAutoConfigurationIntegrationConfigurerTest { diff --git a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationTest.java b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationTest.java index 94750c3..fe8a0ad 100644 --- a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationTest.java +++ b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationIntegrationTest.java @@ -10,47 +10,47 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import infinispan.autoconfigure.embedded.InfinispanEmbeddedAutoConfiguration; import infinispan.autoconfigure.embedded.InfinispanEmbeddedCacheManagerAutoConfiguration; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration({InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class}) +@SpringBootTest(classes = {InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class}) public class InfinispanEmbeddedAutoConfigurationIntegrationTest { - @Autowired - EmbeddedCacheManager defaultCacheManager; + @Autowired + EmbeddedCacheManager defaultCacheManager; - @Autowired - SpringEmbeddedCacheManager springEmbeddedCacheManager; + @Autowired + SpringEmbeddedCacheManager springEmbeddedCacheManager; - @Test - public void contextLoads() { + @Test + public void contextLoads() { - } + } - @Test - public void testAutowired() { - assertThat(defaultCacheManager).isNotNull(); - } + @Test + public void testAutowired() { + assertThat(defaultCacheManager).isNotNull(); + } - @Test - public void testDefaultConfigurations() { - assertThat(defaultCacheManager.getClusterName()).isEqualTo("default-autoconfigure"); - assertThat(defaultCacheManager.getCacheNames()).isEmpty(); + @Test + public void testDefaultConfigurations() { + assertThat(defaultCacheManager.getClusterName()).isEqualTo("default-autoconfigure"); + assertThat(defaultCacheManager.getCacheNames()).isEmpty(); - final Configuration defaultCacheConfiguration = defaultCacheManager.getDefaultCacheConfiguration(); - assertThat(defaultCacheConfiguration.jmxStatistics().enabled()).isFalse(); + final Configuration defaultCacheConfiguration = defaultCacheManager.getDefaultCacheConfiguration(); + assertThat(defaultCacheConfiguration.jmxStatistics().enabled()).isFalse(); - final GlobalConfiguration globalConfiguration = defaultCacheManager.getCacheManagerConfiguration(); - assertThat(globalConfiguration.globalJmxStatistics().enabled()).isTrue(); - assertThat(globalConfiguration.globalJmxStatistics().domain()).isEqualTo(DEFAULT_JMX_DOMAIN); - } + final GlobalConfiguration globalConfiguration = defaultCacheManager.getCacheManagerConfiguration(); + assertThat(globalConfiguration.globalJmxStatistics().enabled()).isTrue(); + assertThat(globalConfiguration.globalJmxStatistics().domain()).isEqualTo(DEFAULT_JMX_DOMAIN); + } - @Test - public void testIfSpringCachingWasCreatedUsingProperEmbeddedCacheManager() throws Exception { - assertThat(defaultCacheManager).isEqualTo(springEmbeddedCacheManager.getNativeCacheManager()); - } + @Test + public void testIfSpringCachingWasCreatedUsingProperEmbeddedCacheManager() throws Exception { + assertThat(defaultCacheManager).isEqualTo(springEmbeddedCacheManager.getNativeCacheManager()); + } } \ No newline at end of file diff --git a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationPropertiesTest.java b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationPropertiesTest.java index da4b0ff..04509cb 100644 --- a/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationPropertiesTest.java +++ b/inifinispan-spring-boot-starter-test-embedded/src/test/java/test/infinispan/autoconfigure/embedded/InfinispanEmbeddedAutoConfigurationPropertiesTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -20,7 +20,7 @@ import infinispan.autoconfigure.embedded.InfinispanEmbeddedCacheManagerAutoConfiguration; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration({InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class}) +@SpringBootTest(classes = {InfinispanEmbeddedAutoConfiguration.class, InfinispanEmbeddedCacheManagerAutoConfiguration.class}) @TestPropertySource(properties = "infinispan.embedded.config-xml=infinispan-test-conf.xml") public class InfinispanEmbeddedAutoConfigurationPropertiesTest {