Only aa tests have aa enabled

Author: jacomago

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java

@@ -28,7 +28,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 @WebMvcTest(AAChannelProcessor.class)
-@TestPropertySource(value = "classpath:application_test.properties")
+@TestPropertySource(value = "classpath:application_aa_proc_test.properties")
 class AAChannelProcessorIT {
 
   protected static Property archiveProperty = new Property("archive", "owner", "default");

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java

@@ -32,7 +32,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 @WebMvcTest(AAChannelProcessor.class)
-@TestPropertySource(value = "classpath:application_test.properties")
+@TestPropertySource(value = "classpath:application_aa_proc_test.properties")
 class AAChannelProcessorMultiIT {
 
   public static final String BEING_ARCHIVED = "Being archived";

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java

@@ -24,7 +24,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.urls:{'default': '','aa': 'http://localhost:17665'}")
 class AAChannelProcessorNoDefaultIT {
   protected static Property archiverProperty = new Property("archiver", "owner", "aa");

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java

@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=none")
 class AAChannelProcessorNoPauseIT {
 

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java

@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=pvStatus")
 class AAChannelProcessorStatusPauseIT {
 

src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java

@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=archive")
 class AAChannelProcessorTagPauseIT {
 

src/test/resources/application_aa_proc_test.properties

@@ -0,0 +1,38 @@
+
+logging.level.org.springframework.web=INFO
+
+############################## Service Info ###############################
+# ChannelFinder version as defined in the pom file
+channelfinder.version=@project.version@
+
+############################## REST Logging ###############################
+# DEBUG level will log all requests and responses to and from the REST end points
+logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
+
+################ Processor ##################################################
+processors.chunking.size=10000
+
+################ Archiver Appliance Configuration Processor #################
+aa.urls={'default': 'http://localhost:17665'}
+aa.default_alias=default
+aa.enabled=true
+aa.pva=false
+aa.archive_property_name=archive
+aa.archiver_property_name=archiver
+
+# Set the auto pause behaviour
+#
+# Empty for no auto pause
+# Or pvStatus to pause on pvStatus=Inactive
+# Or match archive_property_name to pause on archive_property_name not existing
+# Or both, i.e. aa.auto_pause=pvStatus,archive
+#
+aa.auto_pause=pvStatus,archive
+
+
+############################## Metrics ###############################
+#actuator
+management.endpoints.web.exposure.include=prometheus, metrics, health, info
+metrics.tags=
+metrics.properties=
+metrics.updateInterval=1

src/test/resources/application_test.properties

@@ -89,22 +89,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 processors.chunking.size=10000
 
 ################ Archiver Appliance Configuration Processor #################
-aa.urls={'default': 'http://localhost:17665'}
-aa.default_alias=default
-aa.enabled=true
-aa.pva=false
-aa.archive_property_name=archive
-aa.archiver_property_name=archiver
-
-# Set the auto pause behaviour
-#
-# Empty for no auto pause
-# Or pvStatus to pause on pvStatus=Inactive
-# Or match archive_property_name to pause on archive_property_name not existing
-# Or both, i.e. aa.auto_pause=pvStatus,archive
-#
-aa.auto_pause=pvStatus,archive
-
+aa.enabled=false
 
 ############################## Metrics ###############################
 #actuator

src/test/resources/application_test_multi.properties

@@ -87,6 +87,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 
 ################ Archiver Appliance Configuration Processor #################
 aa.urls={'post': 'http://localhost:17664', 'query': 'http://localhost:17665'}
+aa.enabled=true
 aa.default_alias=post, query
 aa.pva=false
 aa.archive_property_name=archive