Skip to content

Commit 36b0457

Browse files
g2vinayg2vinay
authored
Port Identity unit tests to junit5 (Azure#36872)
1 parent 1ccd477 commit 36b0457

25 files changed

+412
-372
lines changed

‎sdk/identity/azure-identity/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,21 @@
5757
<scope>test</scope>
5858
</dependency>
5959
<dependency>
60-
<groupId>junit</groupId>
61-
<artifactId>junit</artifactId>
62-
<version>4.13.2</version> <!-- {x-version-update;junit:junit;external_dependency} -->
60+
<groupId>org.junit.jupiter</groupId>
61+
<artifactId>junit-jupiter-api</artifactId>
62+
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.junit.jupiter</groupId>
67+
<artifactId>junit-jupiter-engine</artifactId>
68+
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
69+
<scope>test</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.junit.jupiter</groupId>
73+
<artifactId>junit-jupiter-params</artifactId>
74+
<version>5.9.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
6375
<scope>test</scope>
6476
</dependency>
6577
<dependency>

‎sdk/identity/azure-identity/src/test/java/com/azure/identity/AuthorizationCodeCredentialTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.azure.identity.implementation.IdentityClient;
99
import com.azure.identity.util.TestUtils;
1010
import com.microsoft.aad.msal4j.MsalServiceException;
11-
import org.junit.Assert;
12-
import org.junit.Test;
11+
import org.junit.jupiter.api.Assertions;
12+
import org.junit.jupiter.api.Test;
1313
import org.mockito.MockedConstruction;
1414
import org.mockito.exceptions.misusing.InvalidUseOfMatchersException;
1515
import reactor.core.publisher.Mono;
@@ -68,7 +68,7 @@ public void testValidAuthorizationCode() throws Exception {
6868
.expectNextMatches(accessToken -> token2.equals(accessToken.getToken())
6969
&& expiresAt.getSecond() == accessToken.getExpiresAt().getSecond())
7070
.verifyComplete();
71-
Assert.assertNotNull(identityclientMock);
71+
Assertions.assertNotNull(identityclientMock);
7272
}
7373
}
7474

‎sdk/identity/azure-identity/src/test/java/com/azure/identity/AzureApplicationCredentialTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import com.azure.identity.implementation.IdentityClient;
1111
import com.azure.identity.util.EmptyEnvironmentConfigurationSource;
1212
import com.azure.identity.util.TestUtils;
13-
import org.junit.Assert;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.Assertions;
14+
import org.junit.jupiter.api.Test;
1515
import org.mockito.MockedConstruction;
1616
import reactor.core.publisher.Mono;
1717
import reactor.test.StepVerifier;
@@ -53,7 +53,7 @@ public void testUseEnvironmentCredential() {
5353
.expectNextMatches(accessToken -> token1.equals(accessToken.getToken())
5454
&& expiresOn.getSecond() == accessToken.getExpiresAt().getSecond())
5555
.verifyComplete();
56-
Assert.assertNotNull(identityClientMock);
56+
Assertions.assertNotNull(identityClientMock);
5757
}
5858
}
5959

@@ -79,8 +79,8 @@ public void testUseManagedIdentityCredential() {
7979
.expectNextMatches(accessToken -> token1.equals(accessToken.getToken())
8080
&& expiresAt.getSecond() == accessToken.getExpiresAt().getSecond())
8181
.verifyComplete();
82-
Assert.assertNotNull(identityClientMock);
83-
Assert.assertNotNull(intelliCredentialMock);
82+
Assertions.assertNotNull(identityClientMock);
83+
Assertions.assertNotNull(intelliCredentialMock);
8484
}
8585
}
8686

@@ -101,7 +101,7 @@ public void testNoCredentialWorks() {
101101
.expectErrorMatches(t -> t instanceof CredentialUnavailableException && t.getMessage()
102102
.startsWith("EnvironmentCredential authentication unavailable. "))
103103
.verify();
104-
Assert.assertNotNull(identityClientMock);
104+
Assertions.assertNotNull(identityClientMock);
105105
}
106106
}
107107

@@ -125,7 +125,7 @@ public void testCredentialUnavailable() {
125125
.expectErrorMatches(t -> t instanceof CredentialUnavailableException && t.getMessage()
126126
.startsWith("EnvironmentCredential authentication unavailable. "))
127127
.verify();
128-
Assert.assertNotNull(managedIdentityCredentialMock);
128+
Assertions.assertNotNull(managedIdentityCredentialMock);
129129
}
130130
}
131131
}

‎sdk/identity/azure-identity/src/test/java/com/azure/identity/AzureCliCredentialTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.azure.identity.implementation.IdentityClientOptions;
1010
import com.azure.identity.implementation.util.IdentityUtil;
1111
import com.azure.identity.util.TestUtils;
12-
import org.junit.Assert;
13-
import org.junit.Test;
12+
import org.junit.jupiter.api.Assertions;
13+
import org.junit.jupiter.api.Test;
1414
import org.mockito.MockedConstruction;
1515
import reactor.core.publisher.Mono;
1616
import reactor.test.StepVerifier;
@@ -41,7 +41,7 @@ public void getTokenMockAsync() throws Exception {
4141
.expectNextMatches(accessToken -> token1.equals(accessToken.getToken())
4242
&& expiresOn.getSecond() == accessToken.getExpiresAt().getSecond())
4343
.verifyComplete();
44-
Assert.assertNotNull(identityClientMock);
44+
Assertions.assertNotNull(identityClientMock);
4545
}
4646
}
4747

@@ -61,7 +61,7 @@ public void azureCliCredentialWinAzureCLINotInstalledException() throws Exceptio
6161
StepVerifier.create(credential.getToken(request))
6262
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure CLI not installed"))
6363
.verify();
64-
Assert.assertNotNull(identityClientMock);
64+
Assertions.assertNotNull(identityClientMock);
6565
}
6666
}
6767

@@ -81,7 +81,7 @@ public void azureCliCredentialAzNotLogInException() throws Exception {
8181
StepVerifier.create(credential.getToken(request))
8282
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure not Login"))
8383
.verify();
84-
Assert.assertNotNull(identityClientMock);
84+
Assertions.assertNotNull(identityClientMock);
8585
}
8686
}
8787

@@ -101,7 +101,7 @@ public void azureCliCredentialAuthenticationFailedException() throws Exception {
101101
StepVerifier.create(credential.getToken(request))
102102
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("other error"))
103103
.verify();
104-
Assert.assertNotNull(identityClientMock);
104+
Assertions.assertNotNull(identityClientMock);
105105
}
106106
}
107107

‎sdk/identity/azure-identity/src/test/java/com/azure/identity/AzureDeveloperCliCredentialTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.azure.identity.implementation.IdentityClient;
88
import com.azure.identity.implementation.IdentityClientOptions;
99
import com.azure.identity.util.TestUtils;
10-
import org.junit.Assert;
11-
import org.junit.Test;
10+
import org.junit.jupiter.api.Assertions;
11+
import org.junit.jupiter.api.Test;
1212
import org.mockito.MockedConstruction;
1313
import reactor.core.publisher.Mono;
1414
import reactor.test.StepVerifier;
@@ -22,7 +22,7 @@ public class AzureDeveloperCliCredentialTest {
2222

2323

2424
@Test
25-
public void getTokenMockAsync() throws Exception {
25+
public void getTokenMockAsync() {
2626
// setup
2727
String token1 = "token1";
2828
TokenRequestContext request = new TokenRequestContext().addScopes("resourcename");
@@ -39,12 +39,12 @@ public void getTokenMockAsync() throws Exception {
3939
.expectNextMatches(accessToken -> token1.equals(accessToken.getToken())
4040
&& expiresOn.getSecond() == accessToken.getExpiresAt().getSecond())
4141
.verifyComplete();
42-
Assert.assertNotNull(identityClientMock);
42+
Assertions.assertNotNull(identityClientMock);
4343
}
4444
}
4545

4646
@Test
47-
public void azureDeveloperCliCredentialWinAzureCLINotInstalledException() throws Exception {
47+
public void azureDeveloperCliCredentialWinAzureCLINotInstalledException() {
4848
// setup
4949
TokenRequestContext request = new TokenRequestContext().addScopes("AzureNotInstalled");
5050

@@ -59,12 +59,12 @@ public void azureDeveloperCliCredentialWinAzureCLINotInstalledException() throws
5959
StepVerifier.create(credential.getToken(request))
6060
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure CLI not installed"))
6161
.verify();
62-
Assert.assertNotNull(identityClientMock);
62+
Assertions.assertNotNull(identityClientMock);
6363
}
6464
}
6565

6666
@Test
67-
public void azureDeveloperCliCredentialAzNotLogInException() throws Exception {
67+
public void azureDeveloperCliCredentialAzNotLogInException() {
6868
// setup
6969
TokenRequestContext request = new TokenRequestContext().addScopes("AzureNotLogin");
7070

@@ -79,12 +79,12 @@ public void azureDeveloperCliCredentialAzNotLogInException() throws Exception {
7979
StepVerifier.create(credential.getToken(request))
8080
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure not Login"))
8181
.verify();
82-
Assert.assertNotNull(identityClientMock);
82+
Assertions.assertNotNull(identityClientMock);
8383
}
8484
}
8585

8686
@Test
87-
public void azureDeveloperCliCredentialAuthenticationFailedException() throws Exception {
87+
public void azureDeveloperCliCredentialAuthenticationFailedException() {
8888
// setup
8989
TokenRequestContext request = new TokenRequestContext().addScopes("AzureDeveloperCliCredentialAuthenticationFailed");
9090

@@ -99,7 +99,7 @@ public void azureDeveloperCliCredentialAuthenticationFailedException() throws Ex
9999
StepVerifier.create(credential.getToken(request))
100100
.expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("other error"))
101101
.verify();
102-
Assert.assertNotNull(identityClientMock);
102+
Assertions.assertNotNull(identityClientMock);
103103
}
104104
}
105105
}

‎sdk/identity/azure-identity/src/test/java/com/azure/identity/AzurePowerShellCredentialTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.azure.identity.implementation.IdentityClient;
88
import com.azure.identity.implementation.IdentityClientOptions;
99
import com.azure.identity.util.TestUtils;
10-
import org.junit.Assert;
11-
import org.junit.Test;
10+
import org.junit.jupiter.api.Assertions;
11+
import org.junit.jupiter.api.Test;
1212
import org.mockito.MockedConstruction;
1313
import reactor.core.publisher.Mono;
1414
import reactor.test.StepVerifier;
@@ -22,7 +22,7 @@
2222
public class AzurePowerShellCredentialTest {
2323

2424
@Test
25-
public void getTokenMockAsync() throws Exception {
25+
public void getTokenMockAsync() {
2626
// setup
2727
String token1 = "token1";
2828
TokenRequestContext request = new TokenRequestContext().addScopes("resourcename");
@@ -40,13 +40,13 @@ public void getTokenMockAsync() throws Exception {
4040
.expectNextMatches(accessToken -> token1.equals(accessToken.getToken())
4141
&& expiresOn.getSecond() == accessToken.getExpiresAt().getSecond())
4242
.verifyComplete();
43-
Assert.assertNotNull(identityClientMock);
43+
Assertions.assertNotNull(identityClientMock);
4444
}
4545

4646
}
4747

4848
@Test
49-
public void azurePowerShellCredentialNotInstalledException() throws Exception {
49+
public void azurePowerShellCredentialNotInstalledException() {
5050
// setup
5151
TokenRequestContext request = new TokenRequestContext().addScopes("AzurePSNotInstalled");
5252

@@ -63,7 +63,7 @@ public void azurePowerShellCredentialNotInstalledException() throws Exception {
6363
.expectErrorMatches(e -> e instanceof Exception && e.getMessage()
6464
.contains("Azure PowerShell not installed"))
6565
.verify();
66-
Assert.assertNotNull(identityClientMock);
66+
Assertions.assertNotNull(identityClientMock);
6767
}
6868
}
6969
}

0 commit comments

Comments
 (0)