Load default properties in all tests

Author: LEDfan

src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java

@@ -26,20 +26,23 @@
 
 import javax.inject.Inject;
 
+import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("test-ldap-auth")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class LDAPAuthenticationTest {
 
 	@Inject

src/test/java/eu/openanalytics/containerproxy/test/auth/NoAuthenticationTest.java

@@ -26,19 +26,22 @@
 
 import javax.inject.Inject;
 
+import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("test-no-auth")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class NoAuthenticationTest {
 
 	@Inject

src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java

@@ -26,20 +26,23 @@
 
 import javax.inject.Inject;
 
+import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
 @AutoConfigureMockMvc
 @ActiveProfiles("test-simple-auth")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class SimpleAuthenticationTest {
 
 	@Inject

src/test/java/eu/openanalytics/containerproxy/test/e2e/app_recovery/TestAppRecovery.java

@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-
 public class TestAppRecovery extends KubernetesTestBase {
 
     private static Stream<Arguments> provideStringsForIsBlank() {

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestConcurrentUsers.java

@@ -41,6 +41,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import eu.openanalytics.containerproxy.ContainerProxyApplication;
@@ -50,6 +51,7 @@
 @SpringBootTest(classes = { ContainerProxyApplication.class }, webEnvironment = WebEnvironment.RANDOM_PORT)
 @RunWith(SpringRunner.class)
 @ActiveProfiles("test")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class TestConcurrentUsers {
 
 	@Inject

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java

@@ -32,6 +32,7 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import eu.openanalytics.containerproxy.ContainerProxyApplication;
@@ -44,6 +45,7 @@
 @SpringBootTest(classes= {TestConfiguration.class, ContainerProxyApplication.class})
 @RunWith(SpringRunner.class)
 @ActiveProfiles("test")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class TestProxyService {
 
 	@Inject

src/test/java/eu/openanalytics/containerproxy/test/unit/TestComputeTargetPath.java

@@ -22,18 +22,21 @@
 
 import eu.openanalytics.containerproxy.ContainerProxyApplication;
 import eu.openanalytics.containerproxy.backend.AbstractContainerBackend;
+import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
 import eu.openanalytics.containerproxy.test.proxy.TestProxyService.TestConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;
 
 @SpringBootTest(classes= {TestConfiguration.class, ContainerProxyApplication.class})
 @RunWith(SpringRunner.class)
 @ActiveProfiles("test")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class TestComputeTargetPath {
 
 	@Test

src/test/java/eu/openanalytics/containerproxy/test/unit/TestOpenIdParseClaimRoles.java

@@ -22,6 +22,7 @@
 
 import eu.openanalytics.containerproxy.ContainerProxyApplication;
 import eu.openanalytics.containerproxy.auth.impl.OpenIDAuthenticationBackend;
+import eu.openanalytics.containerproxy.test.proxy.PropertyOverrideContextInitializer;
 import eu.openanalytics.containerproxy.test.proxy.TestProxyService;
 import net.minidev.json.JSONArray;
 import org.apache.logging.log4j.LogManager;
@@ -30,6 +31,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
@@ -42,6 +44,7 @@
 @SpringBootTest(classes= {TestProxyService.TestConfiguration.class, ContainerProxyApplication.class})
 @RunWith(SpringRunner.class)
 @ActiveProfiles("test")
+@ContextConfiguration(initializers = PropertyOverrideContextInitializer.class)
 public class TestOpenIdParseClaimRoles {
 
     private final Logger logger = LogManager.getLogger(OpenIDAuthenticationBackend.class);