Add isolated annotation and junit-platform properties file.

moarychan · Jun 21, 2021 · 679a8cd · 679a8cd
1 parent 61ff332
commit 679a8cd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 67 deletions.
diff --git a/...t/src/test/java/com/azure/spring/aad/webapi/AADResourceServerClientConfigurationTest.java b/...t/src/test/java/com/azure/spring/aad/webapi/AADResourceServerClientConfigurationTest.java
@@ -5,6 +5,7 @@
 
 import com.azure.spring.autoconfigure.aad.AADAuthenticationProperties;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -24,6 +25,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@Isolated
 public class AADResourceServerClientConfigurationTest {
 
     @EnableWebSecurity

diff --git a/...om/azure/spring/aad/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java b/...om/azure/spring/aad/webapp/AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest.java
@@ -5,6 +5,7 @@
 
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.http.HttpEntity;
@@ -23,6 +24,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Isolated
 public class AADOAuth2AuthorizationCodeGrantRequestEntityConverterTest {
 
     private AADWebAppClientRegistrationRepository clientRepo;

diff --git a/...ure-spring-boot/src/test/java/com/azure/spring/aad/webapp/AADWebAppConfigurationTest.java b/...ure-spring-boot/src/test/java/com/azure/spring/aad/webapp/AADWebAppConfigurationTest.java
@@ -6,6 +6,7 @@
 import com.azure.spring.aad.AADAuthorizationServerEndpoints;
 import com.azure.spring.autoconfigure.aad.AADAuthenticationProperties;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
@@ -25,6 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@Isolated
 public class AADWebAppConfigurationTest {
 
     @Test
@@ -74,7 +76,7 @@ public void clientRegistered() {
                     azure.getProviderDetails().getAuthorizationUri());
                 assertEquals(endpoints.tokenEndpoint(), azure.getProviderDetails().getTokenUri());
                 assertEquals(endpoints.jwkSetEndpoint(), azure.getProviderDetails().getJwkSetUri());
-                assertEquals("{baseUrl}/login/oauth2/code/", azure.getRedirectUriTemplate());
+                assertEquals("{baseUrl}/login/oauth2/code/", azure.getRedirectUri());
                 assertDefaultScopes(azure, "openid", "profile");
             });
     }
@@ -146,8 +148,6 @@ public void clientWithClientCredentialsPermissions() {
             .run(context -> {
                 AADWebAppClientRegistrationRepository repo =
                     context.getBean(AADWebAppClientRegistrationRepository.class);
-                ClientRegistration azure = repo.findByRegistrationId("azure");
-                ClientRegistration graph = repo.findByRegistrationId("graph");
 
                 assertEquals(repo.findByRegistrationId("azure").getAuthorizationGrantType(),
                     AuthorizationGrantType.AUTHORIZATION_CODE);

diff --git a/...azure-spring-boot/src/test/java/com/azure/spring/aad/webapp/AuthorizedClientRepoTest.java b/...azure-spring-boot/src/test/java/com/azure/spring/aad/webapp/AuthorizedClientRepoTest.java
@@ -4,6 +4,7 @@
 package com.azure.spring.aad.webapp;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -24,6 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@Isolated
 public class AuthorizedClientRepoTest {
 
     private ClientRegistration azure;

diff --git a/...spring-boot/src/test/java/com/azure/spring/autoconfigure/cosmos/CosmosPropertiesTest.java b/...spring-boot/src/test/java/com/azure/spring/autoconfigure/cosmos/CosmosPropertiesTest.java
@@ -4,6 +4,7 @@
 
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBindException;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.bind.validation.BindValidationException;
@@ -18,6 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Isolated
 public class CosmosPropertiesTest {
 
     @Test

diff --git a/sdk/spring/azure-spring-boot/src/test/resources/aad/azure-ad-graph-user-groups.json b/sdk/spring/azure-spring-boot/src/test/resources/aad/azure-ad-graph-user-groups.json
diff --git a/sdk/spring/azure-spring-boot/src/test/resources/junit-platform.properties b/sdk/spring/azure-spring-boot/src/test/resources/junit-platform.properties
@@ -0,0 +1,3 @@
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = concurrent
+junit.jupiter.execution.parallel.mode.classes.default = concurrent