Use limited ContextConfiguration enabled

Author: jacomago

src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java

@@ -25,13 +25,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(
+    classes = {ChannelController.class, ElasticConfig.class, ChannelRepository.class})
 class ChannelControllerIT {
 
   @Autowired IChannel channelManager;

src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java

@@ -25,6 +25,7 @@
 import org.phoebus.channelfinder.repository.TagRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -33,6 +34,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelRepository.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class})
 class ChannelRepositoryIT {
 
   @Autowired ElasticConfig esService;

src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java

@@ -25,13 +25,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelRepository.class)
 @TestPropertySource(locations = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class})
 class ChannelRepositorySearchIT {
   private static final Logger logger = Logger.getLogger(ChannelRepositorySearchIT.class.getName());
 

src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java

@@ -16,13 +16,15 @@
 import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class})
 class ChannelScrollControllerIT {
 
   @Autowired IChannelScroll channelScroll;

src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java

@@ -18,13 +18,15 @@
 import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class})
 class ChannelScrollControllerSearchIT {
 
   private static final Logger logger =

src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java

@@ -22,13 +22,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelController.class, ElasticConfig.class})
 class ChannelValidationIT {
 
   @Autowired IChannel channelManager;

src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java

@@ -25,6 +25,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.util.LinkedMultiValueMap;
@@ -41,6 +42,7 @@
       "metrics.properties=testProperty0: value0, value1; testProperty1: value0, !*",
       "metrics.updateInterval=1"
     })
+@ContextConfiguration(classes = {ElasticConfig.class, MetricsService.class})
 class MetricsServiceIT {
 
   public static final String METRICS_ENDPOINT = "/actuator/metrics";

src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java

@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -35,6 +36,7 @@
 @WebMvcTest(PropertyController.class) // TODO Somehow creating one
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class})
 class PropertyControllerIT {
 
   @Autowired IProperty propertyManager;

src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java

@@ -21,6 +21,7 @@
 import org.phoebus.channelfinder.repository.PropertyRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -29,6 +30,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(PropertyRepository.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyRepository.class, ElasticConfig.class})
 class PropertyRepositoryIT {
   public static final String TEST_PROPERTY_NAME = "testProperty";
 

src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java

@@ -19,13 +19,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(PropertyController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class})
 class PropertyValidationIT {
 
   @Autowired IProperty propertyManager;