diff --git a/LibsAndSamples.sln b/LibsAndSamples.sln index d7cad8298f..57930cbafa 100644 --- a/LibsAndSamples.sln +++ b/LibsAndSamples.sln @@ -54,7 +54,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalV2", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.Unit", "tests\CacheCompat\CommonCache.Test.Unit\CommonCache.Test.Unit.csproj", "{3C21354D-601A-4902-A728-419C70891338}" ProjectSection(ProjectDependencies) = postProject - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11} = {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11} {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} = {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} {8672FC71-00DE-491D-BCEB-101A2A7887E6} = {8672FC71-00DE-491D-BCEB-101A2A7887E6} {2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {2EAA7878-3E2A-4355-9841-430BF45EA8BD} @@ -67,8 +66,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.AdalV5", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalJava", "tests\CacheCompat\CommonCache.Test.MsalJava\CommonCache.Test.MsalJava.csproj", "{B6BE589B-1DBB-4C36-803F-6D425723FA74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalPython", "tests\CacheCompat\CommonCache.Test.MsalPython\CommonCache.Test.MsalPython.csproj", "{CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonCache.Test.MsalV3", "tests\CacheCompat\CommonCache.Test.MsalV3\CommonCache.Test.MsalV3.csproj", "{2EAA7878-3E2A-4355-9841-430BF45EA8BD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FociTestApp", "tests\devapps\FociTestApp\FociTestApp.csproj", "{24D2AF71-A01E-4450-8C3F-B9923A81134B}" @@ -989,48 +986,6 @@ Global {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Release|x64.Build.0 = Release|Any CPU {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Release|x86.ActiveCfg = Release|Any CPU {B6BE589B-1DBB-4C36-803F-6D425723FA74}.Release|x86.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|ARM.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|ARM64.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|ARM64.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|iPhone.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|iPhone.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|iPhoneSimulator.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|iPhoneSimulator.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|x64.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|x64.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|x86.ActiveCfg = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug + MobileApps|x86.Build.0 = Debug + MobileApps|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|ARM.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|ARM.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|ARM64.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|iPhone.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|x64.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|x64.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Debug|x86.Build.0 = Debug|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|Any CPU.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|ARM.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|ARM.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|ARM64.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|ARM64.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|iPhone.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|iPhone.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|x64.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|x64.Build.0 = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|x86.ActiveCfg = Release|Any CPU - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11}.Release|x86.Build.0 = Release|Any CPU {2EAA7878-3E2A-4355-9841-430BF45EA8BD}.Debug + MobileApps|Any CPU.ActiveCfg = Debug + MobileApps|Any CPU {2EAA7878-3E2A-4355-9841-430BF45EA8BD}.Debug + MobileApps|Any CPU.Build.0 = Debug + MobileApps|Any CPU {2EAA7878-3E2A-4355-9841-430BF45EA8BD}.Debug + MobileApps|ARM.ActiveCfg = Debug + MobileApps|Any CPU @@ -2707,7 +2662,6 @@ Global {3C21354D-601A-4902-A728-419C70891338} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {4DDB6B3A-F95A-4F34-B0AE-E3C909D68A11} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {B6BE589B-1DBB-4C36-803F-6D425723FA74} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} - {CA3F8F2E-7DF2-45A6-BC81-5DA5692FCC11} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {2EAA7878-3E2A-4355-9841-430BF45EA8BD} = {58B95AA7-BE17-40F2-9C9A-FA27C282A10A} {24D2AF71-A01E-4450-8C3F-B9923A81134B} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB} {959A47D9-07E7-4BF3-A0F7-6D9CD42A2C46} = {34BE693E-3496-45A4-B1D2-D3A0E068EEDB} diff --git a/tests/CacheCompat/CommonCache.Test.MsalNode/NodeLanguageExecutor.cs b/tests/CacheCompat/CommonCache.Test.MsalNode/NodeLanguageExecutor.cs index ce446721fe..4b292c1487 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalNode/NodeLanguageExecutor.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalNode/NodeLanguageExecutor.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using CommonCache.Test.Common; -namespace CommonCache.Test.MsalPython +namespace CommonCache.Test.MsalNode { public class NodeLanguageExecutor : ILanguageExecutor { diff --git a/tests/CacheCompat/CommonCache.Test.MsalNode/Program.cs b/tests/CacheCompat/CommonCache.Test.MsalNode/Program.cs index 649a32ed9a..64dce6921a 100644 --- a/tests/CacheCompat/CommonCache.Test.MsalNode/Program.cs +++ b/tests/CacheCompat/CommonCache.Test.MsalNode/Program.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using CommonCache.Test.Common; -namespace CommonCache.Test.MsalPython +namespace CommonCache.Test.MsalNode { public static class Program { diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs b/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs index d94c14ea88..893c23c086 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/CacheExecutionTests.cs @@ -135,20 +135,6 @@ public async Task TestMsalV3CacheCompatibilityAsync( await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false); } - [DataTestMethod] - [DataRow(CacheProgramType.MsalPython, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalPython->MsalV3 msal v3 cache")] - [DataRow(CacheProgramType.MsalPython, CacheProgramType.AdalV5, CacheStorageType.MsalV3, DisplayName = "MsalPython->AdalV5 msal v3 cache")] - [DataRow(CacheProgramType.MsalV3, CacheProgramType.MsalPython, CacheStorageType.MsalV3, DisplayName = "MsalV3->MsalPython msal v3 cache")] - [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalPython, CacheStorageType.MsalV3, DisplayName = "AdalV5->MsalPython msal v3 cache")] - public async Task TestMsalPythonCacheCompatibilityAsync( - CacheProgramType interactiveType, - CacheProgramType silentType, - CacheStorageType cacheStorageType) - { - var executor = new CacheTestExecutor(s_labUsers, cacheStorageType); - await executor.ExecuteAsync(interactiveType, silentType, CancellationToken.None).ConfigureAwait(false); - } - [Ignore] // https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/2272 [DataTestMethod] [DataRow(CacheProgramType.MsalNode, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalNode->MsalV3 msal v3 cache")] @@ -169,8 +155,6 @@ public async Task TestMsalNodeCacheCompatibilityAsync( [DataRow(CacheProgramType.MsalJava, CacheProgramType.MsalV3, CacheStorageType.MsalV3, DisplayName = "MsalJava->MsalV3 msal v3 cache")] [DataRow(CacheProgramType.MsalJava, CacheProgramType.AdalV5, CacheStorageType.MsalV3, DisplayName = "MsalJava->AdalV5 msal v3 cache")] [DataRow(CacheProgramType.AdalV5, CacheProgramType.MsalJava, CacheStorageType.MsalV3, DisplayName = "AdalV5->MsalJava msal v3 cache")] - [DataRow(CacheProgramType.MsalJava, CacheProgramType.MsalPython, CacheStorageType.MsalV3, DisplayName = "MsalJava->MsalPython msal v3 cache")] - [DataRow(CacheProgramType.MsalPython, CacheProgramType.MsalJava, CacheStorageType.MsalV3, DisplayName = "MsalPython->MsalJava msal v3 cache")] public async Task TestMsalJavaCacheCompatibilityAsync( CacheProgramType interactiveType, CacheProgramType silentType, diff --git a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj index 6f0ae61397..a9f61b58dd 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj +++ b/tests/CacheCompat/CommonCache.Test.Unit/CommonCache.Test.Unit.csproj @@ -38,9 +38,6 @@ false - - false - false @@ -62,7 +59,6 @@ - diff --git a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs index 2822ce0f81..f8c93f0374 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramFactory.cs @@ -39,10 +39,6 @@ public static CacheProgram CreateCacheProgram(CacheProgramType cacheProgramType, executablePath = Path.Combine(BaseExecutablePath, "MsalV3", "CommonCache.Test.MsalV3.exe"); resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "msalv3results.json"); break; - case CacheProgramType.MsalPython: - executablePath = Path.Combine(BaseExecutablePath, "MsalPython", "CommonCache.Test.MsalPython.exe"); - resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "msal_python_results.json"); - break; case CacheProgramType.MsalJava: executablePath = Path.Combine(BaseExecutablePath, "MsalJava", "CommonCache.Test.MsalJava.exe"); resultsFilePath = Path.Combine(CommonCacheTestUtils.CacheFileDirectory, "msal_java_results.json"); diff --git a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramType.cs b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramType.cs index 5179f57d8b..93308ff927 100644 --- a/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramType.cs +++ b/tests/CacheCompat/CommonCache.Test.Unit/Utils/CacheProgramType.cs @@ -10,7 +10,6 @@ public enum CacheProgramType AdalV5, MsalV2, MsalV3, - MsalPython, MsalJava, MsalNode }