Skip to content

Sjain/test ng dependency #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
siddhijain wants to merge 3 commits into from
Closed

Sjain/test ng dependency #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
303c3ae
commit working tests
siddhijain Feb 8, 2023
9b939af
commit working tests
siddhijain Feb 8, 2023
8e2d1b5
Fix build issue
siddhijain Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions msal4j-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,55 @@
<version>2.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>3.4.6</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/net.bytebuddy/byte-buddy -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.12.20</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>2.0.9</version>
</dependency>

</dependencies>

<!-- force https -->
Expand Down Expand Up @@ -197,6 +246,13 @@
<configuration>
<argLine>-noverify</argLine>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand Down
94 changes: 53 additions & 41 deletions msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,78 +7,90 @@
import labapi.B2CProvider;
import labapi.FederationProvider;
import labapi.User;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.Collections;
import java.util.concurrent.ExecutionException;

public class AcquireTokenInteractiveIT extends SeleniumTest {
import static org.junit.jupiter.api.Assertions.*;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class AcquireTokenInteractiveIT extends SeleniumTest {
private final static Logger LOG = LoggerFactory.getLogger(AuthorizationCodeIT.class);

private Config cfg;

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenInteractive_ManagedUser(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ManagedUser(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getDefaultUser(cfg.azureEnvironment);
assertAcquireTokenAAD(user);
}

@Test()
public void acquireTokenInteractive_ADFSv2019_OnPrem() {
void acquireTokenInteractive_ADFSv2019_OnPrem() {
User user = labUserProvider.getOnPremAdfsUser(FederationProvider.ADFS_2019);
assertAcquireTokenADFS2019(user);
}

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenInteractive_ADFSv2019_Federated(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ADFSv2019_Federated(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2019);
assertAcquireTokenAAD(user);
}

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenInteractive_ADFSv4_Federated(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ADFSv4_Federated(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_4);
assertAcquireTokenAAD(user);
}

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenInteractive_ADFSv3_Federated(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ADFSv3_Federated(String environment) {

cfg = new Config(environment);

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_3);
assertAcquireTokenAAD(user);
}

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenInteractive_ADFSv2_Federated(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenInteractive_ADFSv2_Federated(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getFederatedAdfsUser(cfg.azureEnvironment, FederationProvider.ADFS_2);
assertAcquireTokenAAD(user);
}

@Test(dataProvider = "environments", dataProviderClass = EnvironmentsProvider.class)
public void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {
@ParameterizedTest
@MethodSource("com.microsoft.aad.msal4j.EnvironmentsProvider#createData")
void acquireTokenWithAuthorizationCode_B2C_Local(String environment) {
cfg = new Config(environment);

User user = labUserProvider.getB2cUser(cfg.azureEnvironment, B2CProvider.LOCAL);
assertAcquireTokenB2C(user);
}

@Test
public void acquireTokenInteractive_ManagedUser_InstanceAware() {
void acquireTokenInteractive_ManagedUser_InstanceAware() {
cfg = new Config(AzureEnvironment.AZURE);

User user = labUserProvider.getDefaultUser(AzureEnvironment.AZURE_US_GOVERNMENT);
Expand All @@ -101,10 +113,10 @@ private void assertAcquireTokenAAD(User user) {
pca,
cfg.graphDefaultScope());

Assert.assertNotNull(result);
Assert.assertNotNull(result.accessToken());
Assert.assertNotNull(result.idToken());
Assert.assertEquals(user.getUpn(), result.account().username());
assertNotNull(result);
assertNotNull(result.accessToken());
assertNotNull(result.idToken());
assertEquals(user.getUpn(), result.account().username());
}

private void assertAcquireTokenADFS2019(User user) {
Expand All @@ -120,10 +132,10 @@ private void assertAcquireTokenADFS2019(User user) {

IAuthenticationResult result = acquireTokenInteractive(user, pca, TestConstants.ADFS_SCOPE);

Assert.assertNotNull(result);
Assert.assertNotNull(result.accessToken());
Assert.assertNotNull(result.idToken());
Assert.assertEquals(user.getUpn(), result.account().username());
assertNotNull(result);
assertNotNull(result.accessToken());
assertNotNull(result.idToken());
assertEquals(user.getUpn(), result.account().username());
}

private void assertAcquireTokenB2C(User user) {
Expand All @@ -139,9 +151,9 @@ private void assertAcquireTokenB2C(User user) {
}

IAuthenticationResult result = acquireTokenInteractive(user, pca, user.getAppId());
Assert.assertNotNull(result);
Assert.assertNotNull(result.accessToken());
Assert.assertNotNull(result.idToken());
assertNotNull(result);
assertNotNull(result.accessToken());
assertNotNull(result.idToken());
}

private void assertAcquireTokenInstanceAware(User user) {
Expand All @@ -157,16 +169,16 @@ private void assertAcquireTokenInstanceAware(User user) {

IAuthenticationResult result = acquireTokenInteractive_instanceAware(user, pca, cfg.graphDefaultScope());

Assert.assertNotNull(result);
Assert.assertNotNull(result.accessToken());
Assert.assertNotNull(result.idToken());
Assert.assertEquals(user.getUpn(), result.account().username());
assertNotNull(result);
assertNotNull(result.accessToken());
assertNotNull(result.idToken());
assertEquals(user.getUpn(), result.account().username());

//This test is using a client app with the login.microsoftonline.com config to get tokens for a login.microsoftonline.us user,
// so when using instance aware the result's environment will be for the user/account and not the client app
Assert.assertNotEquals(pca.authenticationAuthority.host, result.environment());
Assert.assertEquals(result.account().environment(), result.environment());
Assert.assertEquals(result.account().environment(), pca.getAccounts().join().iterator().next().environment());
assertNotEquals(pca.authenticationAuthority.host, result.environment());
assertEquals(result.account().environment(), result.environment());
assertEquals(result.account().environment(), pca.getAccounts().join().iterator().next().environment());

IAuthenticationResult cachedResult;
try {
Expand All @@ -176,7 +188,7 @@ private void assertAcquireTokenInstanceAware(User user) {
}

//Ensure that the cached environment matches the original auth result environment (.us) instead of the client app's (.com)
Assert.assertEquals(result.account().environment(), cachedResult.environment());
assertEquals(result.account().environment(), cachedResult.environment());
}

//@Test
Expand Down Expand Up @@ -223,14 +235,14 @@ public void afterCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext)
build();

IAuthenticationResult result = acquireTokenInteractive(user, publicCloudPca, TestConstants.USER_READ_SCOPE);
Assert.assertNotNull(result);
Assert.assertNotNull(result.accessToken());
Assert.assertNotNull(result.idToken());
Assert.assertEquals(user.getHomeUPN(), result.account().username());
assertNotNull(result);
assertNotNull(result.accessToken());
assertNotNull(result.idToken());
assertEquals(user.getHomeUPN(), result.account().username());

publicCloudPca.removeAccount(publicCloudPca.getAccounts().join().iterator().next()).join();

Assert.assertEquals(publicCloudPca.getAccounts().join().size(), 0);
assertEquals(0, publicCloudPca.getAccounts().join().size());
}

private IAuthenticationResult acquireTokenInteractive(
Expand Down
Loading