Removed a few deprecated APIs

apereo · Aug 26, 2016 · 6aa745e · 6aa745e
1 parent 25c547c
commit 6aa745e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/...c/test/java/org/apereo/cas/adaptors/gauth/JpaGoogleAuthenticatorAccountRegistryTests.java b/...c/test/java/org/apereo/cas/adaptors/gauth/JpaGoogleAuthenticatorAccountRegistryTests.java
@@ -8,7 +8,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -23,7 +23,7 @@
  * @since 5.0.0
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(
+@SpringBootTest(
         classes = {GoogleAuthentiacatorJpaConfiguration.class, AopAutoConfiguration.class, RefreshAutoConfiguration.class})
 @EnableTransactionManagement
 @EnableAspectJAutoProxy(proxyTargetClass = true)

diff --git a/...cket-registry/src/test/java/org/apereo/cas/ticket/registry/IgniteTicketRegistryTests.java b/...cket-registry/src/test/java/org/apereo/cas/ticket/registry/IgniteTicketRegistryTests.java
@@ -17,6 +17,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.ConfigFileApplicationContextInitializer;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -33,8 +34,7 @@
  * @since 3.0.0
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {RefreshAutoConfiguration.class, IgniteTicketRegistryConfiguration.class}, 
-        initializers = ConfigFileApplicationContextInitializer.class)
+@SpringBootTest(classes = {RefreshAutoConfiguration.class, IgniteTicketRegistryConfiguration.class}) 
 public class IgniteTicketRegistryTests {
 
     private static final int TICKETS_IN_REGISTRY = 10;

diff --git a/...-registry/src/test/java/org/apereo/cas/ticket/registry/InfinispanTicketRegistryTests.java b/...-registry/src/test/java/org/apereo/cas/ticket/registry/InfinispanTicketRegistryTests.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -24,7 +25,7 @@
  * @since 4.2.0
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(
+@SpringBootTest(
         classes = {RefreshAutoConfiguration.class, InfinispanTicketRegistryConfiguration.class})
 public class InfinispanTicketRegistryTests {
 

diff --git a/...ervice-registry/src/test/java/org/apereo/cas/services/JpaServiceRegistryDaoImplTests.java b/...ervice-registry/src/test/java/org/apereo/cas/services/JpaServiceRegistryDaoImplTests.java
@@ -9,8 +9,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.ConfigFileApplicationContextInitializer;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -30,8 +29,7 @@
  * @since 3.1.0
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {RefreshAutoConfiguration.class, JpaServiceRegistryConfiguration.class},
-        initializers = ConfigFileApplicationContextInitializer.class)
+@SpringBootTest(classes = {RefreshAutoConfiguration.class, JpaServiceRegistryConfiguration.class})
 public class JpaServiceRegistryDaoImplTests {
 
     @Autowired