Skip to content

mstest 4 #5621

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

Open
bgavrilMS wants to merge 5 commits into
base: main
Choose a base branch
from
Open

mstest 4 #5621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4881f55
wip
bgavrilMS Dec 9, 2025
cc05ba3
Update
bgavrilMS Dec 17, 2025
ec8d098
Remove old assert exception
bgavrilMS Dec 17, 2025
f0e1969
Various fixes
bgavrilMS Dec 17, 2025
497f73b
fixes?
bgavrilMS Dec 17, 2025
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
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.35.0" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.SignedHttpRequest" Version="6.35.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
Expand Down
4 changes: 2 additions & 2 deletions tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void AssemblyInit(TestContext testContext)
s_labUsers.Add(GetPublicAadUserDataAsync().GetAwaiter().GetResult());
}

[DataTestMethod]
[TestMethod]
[DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalV3, CacheStorageType.MsalV2, DisplayName = "MsalV3->MsalV3 msal v2 cache")]
[DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalV3->MsalV3 msal v3 cache")]
public async Task TestMsalV3CacheCompatibilityAsync(
Expand All @@ -46,7 +46,7 @@ public async Task TestMsalV3CacheCompatibilityAsync(
await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false);
}

[DataTestMethod]
[TestMethod]
[DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalJava, CacheStorageType.MsalV3, DisplayName = "MsalV3->MsalJava msal v3 cache")]
[DataRow(CacheProgramType.MsalJava, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalJava->MsalV3 msal v3 cache")]
public async Task TestMsalJavaCacheCompatibilityAsync(
Expand Down
6 changes: 6 additions & 0 deletions tests/CacheCompat/CommonCache.Test.Unit/ParallelizationSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: DoNotParallelize]
242 changes: 0 additions & 242 deletions tests/Microsoft.Identity.Test.Common/Core/Helpers/AssertException.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tests/Microsoft.Identity.Test.Common/Core/Helpers/CoreAssert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public static void AreScopesEqual(string scopesExpected, string scopesActual)
var actualScopes = ScopeHelper.ConvertStringToScopeSet(scopesActual);

// can't use Assert.AreEqual on HashSet, so we'll compare by hand.
Assert.AreEqual(expectedScopes.Count, actualScopes.Count);
Assert.HasCount(expectedScopes.Count, actualScopes);
foreach (string expectedScope in expectedScopes)
{
Assert.IsTrue(actualScopes.Contains(expectedScope));
Assert.Contains(expectedScope, actualScopes);
}
}

Expand Down
Loading
Loading