diff --git a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
index c65ae0012e..fef3e315db 100644
--- a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
+++ b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
@@ -32,7 +32,7 @@ internal AssemblyMetadataProvider(IFileHelper fileHelper)
}
///
- public FrameworkName GetFrameWork(string filePath)
+ public FrameworkName GetFrameworkName(string filePath)
{
FrameworkName frameworkName = new(Framework.DefaultFramework.Name);
try
@@ -42,10 +42,10 @@ public FrameworkName GetFrameWork(string filePath)
}
catch (Exception ex)
{
- EqtTrace.Warning("AssemblyMetadataProvider.GetFrameWork: failed to determine TargetFrameworkVersion exception: {0} for assembly: {1}", ex, filePath);
+ EqtTrace.Warning("AssemblyMetadataProvider.GetFrameworkName: failed to determine TargetFrameworkVersion exception: {0} for assembly: {1}", ex, filePath);
}
- EqtTrace.Info("AssemblyMetadataProvider.GetFrameWork: Determined framework:'{0}' for source: '{1}'", frameworkName, filePath);
+ EqtTrace.Info("AssemblyMetadataProvider.GetFrameworkName: Determined framework:'{0}' for source: '{1}'", frameworkName, filePath);
return frameworkName;
}
diff --git a/src/vstest.console/CommandLine/InferHelper.cs b/src/vstest.console/CommandLine/InferHelper.cs
index 5cd37cbef3..1e105985e7 100644
--- a/src/vstest.console/CommandLine/InferHelper.cs
+++ b/src/vstest.console/CommandLine/InferHelper.cs
@@ -133,35 +133,24 @@ public Architecture AutoDetectArchitecture(IList? sources, Architecture
public Framework AutoDetectFramework(IList? sources, out IDictionary sourceToFrameworkMap)
{
sourceToFrameworkMap = new Dictionary();
- Framework framework = Framework.DefaultFramework;
if (sources == null || sources.Count == 0)
- return framework;
+ return Framework.DefaultFramework;
- try
+ var framework = DetermineFramework(sources, out sourceToFrameworkMap, out var conflictInFxIdentifier);
+ if (conflictInFxIdentifier)
{
- var finalFx = DetermineFrameworkName(sources, out sourceToFrameworkMap, out var conflictInFxIdentifier);
- TPDebug.Assert(finalFx != null, "finalFx should not be null");
- framework = Framework.FromString(finalFx.FullName);
- if (conflictInFxIdentifier)
- {
- // TODO Log to console and client.
- EqtTrace.Info(
- "conflicts in Framework identifier of provided sources(test assemblies), using default framework:{0}",
- framework);
- }
- }
- catch (Exception ex)
- {
- EqtTrace.Error("Failed to determine framework:{0}, using default: {1}", ex, framework);
+ // TODO Log to console and client.
+ EqtTrace.Info(
+ "conflicts in Framework identifier of provided sources(test assemblies), using default framework: {0}",
+ framework);
}
EqtTrace.Info("Determined framework for all sources: {0}", framework);
-
return framework;
}
- private FrameworkName? DetermineFrameworkName(IEnumerable sources, out IDictionary sourceToFrameworkMap, out bool conflictInFxIdentifier)
+ private Framework DetermineFramework(IEnumerable sources, out IDictionary sourceToFrameworkMap, out bool conflictInFxIdentifier)
{
sourceToFrameworkMap = new Dictionary();
@@ -180,7 +169,7 @@ public Framework AutoDetectFramework(IList? sources, out IDictionary? sources, out IDictionary
/// Determines FrameworkName from filePath.
///
- FrameworkName GetFrameWork(string filePath);
+ FrameworkName GetFrameworkName(string filePath);
///
/// Determines Architecture from filePath.
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs b/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs
index 813b59724d..cf1c4dfbb3 100644
--- a/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs
+++ b/test/vstest.ProgrammerTests/Fakes/FakeAssemblyMetadataProvider.cs
@@ -26,7 +26,7 @@ public Architecture GetArchitecture(string filePath)
return file.Architecture;
}
- public FrameworkName GetFrameWork(string filePath)
+ public FrameworkName GetFrameworkName(string filePath)
{
var file = FakeFileHelper.GetFakeFile(filePath);
return file.FrameworkName;
diff --git a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs b/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs
index 14ac01b232..8b6eef60fe 100644
--- a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs
+++ b/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs
@@ -115,7 +115,7 @@ public void GetFrameWorkForDotNetAssembly(string framework)
var assemblyPath = _testEnvironment.GetTestAsset("SimpleTestProject3.dll", framework);
LoadAssemblyIntoMemory(assemblyPath);
var stopWatch = Stopwatch.StartNew();
- var actualFx = _assemblyMetadataProvider.GetFrameWork(assemblyPath);
+ var actualFx = _assemblyMetadataProvider.GetFrameworkName(assemblyPath);
stopWatch.Stop();
if (framework.Equals("net451"))
@@ -142,7 +142,7 @@ public void GetFrameWorkForNativeDll()
var assemblyPath = $@"{_testEnvironment.PackageDirectory}\microsoft.testplatform.testasset.nativecpp\2.0.0\contentFiles\any\any\Microsoft.TestPlatform.TestAsset.NativeCPP.dll";
LoadAssemblyIntoMemory(assemblyPath);
var stopWatch = Stopwatch.StartNew();
- var fx = _assemblyMetadataProvider.GetFrameWork(assemblyPath);
+ var fx = _assemblyMetadataProvider.GetFrameworkName(assemblyPath);
stopWatch.Stop();
Console.WriteLine(PerfAssertMessageFormat, expectedElapsedTime, stopWatch.ElapsedMilliseconds);
diff --git a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
index 35daf1fa21..42bd0db434 100644
--- a/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
+++ b/test/vstest.console.UnitTests/CommandLine/InferHelperTests.cs
@@ -222,18 +222,18 @@ public void AutoDetectFrameworkShouldReturnDefaultFullFrameworkForJsFiles()
[TestMethod]
public void AutoDetectFrameworkShouldReturnHighestVersionFxOnSameFxName()
{
- _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny()))
+ _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(_frameworkNet46.Name))
.Returns(new FrameworkName(_frameworkNet47.Name))
.Returns(new FrameworkName(_frameworkNet45.Name));
Assert.AreEqual(_frameworkNet47.Name, _inferHelper.AutoDetectFramework(new List() { "net46.dll", "net47.exe", "net45.dll" }, out _).Name);
- _mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny()), Times.Exactly(3));
+ _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny()), Times.Exactly(3));
}
[TestMethod]
public void AutoDetectFrameworkShouldPopulatetheDictionaryForAllTheSources()
{
- _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny()))
+ _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(_frameworkNet46.Name))
.Returns(new FrameworkName(_frameworkNet47.Name))
.Returns(new FrameworkName(_frameworkNet45.Name));
@@ -244,28 +244,28 @@ public void AutoDetectFrameworkShouldPopulatetheDictionaryForAllTheSources()
Assert.AreEqual(_frameworkNet46.Name, sourceFrameworks["net46.dll"].Name);
Assert.AreEqual(_frameworkNet47.Name, sourceFrameworks["net47.exe"].Name);
Assert.AreEqual(_frameworkNet45.Name, sourceFrameworks["net45.dll"].Name);
- _mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny()), Times.Exactly(3));
+ _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny()), Times.Exactly(3));
}
[TestMethod]
public void AutoDetectFrameworkShouldReturnHighestVersionFxOnEvenManyLowerVersionFxNameExists()
{
- _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameWork(It.IsAny()))
+ _mockAssemblyHelper.SetupSequence(sh => sh.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(_frameworkCore10.Name))
.Returns(new FrameworkName(_frameworkCore11.Name))
.Returns(new FrameworkName(_frameworkCore10.Name));
Assert.AreEqual(_frameworkCore11.Name, _inferHelper.AutoDetectFramework(new List() { "netcore10_1.dll", "netcore11.dll", "netcore10_2.dll" }, out _).Name);
- _mockAssemblyHelper.Verify(ah => ah.GetFrameWork(It.IsAny()), Times.Exactly(3));
+ _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(It.IsAny()), Times.Exactly(3));
}
private void SetupAndValidateForSingleAssembly(string assemblyName, Framework fx, bool verify)
{
- _mockAssemblyHelper.Setup(sh => sh.GetFrameWork(assemblyName))
+ _mockAssemblyHelper.Setup(sh => sh.GetFrameworkName(assemblyName))
.Returns(new FrameworkName(fx.Name));
Assert.AreEqual(fx.Name, _inferHelper.AutoDetectFramework(new List() { assemblyName }, out _).Name);
if (verify)
{
- _mockAssemblyHelper.Verify(ah => ah.GetFrameWork(assemblyName));
+ _mockAssemblyHelper.Verify(ah => ah.GetFrameworkName(assemblyName));
}
}
}
diff --git a/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
index bdb0456965..8f7d808751 100644
--- a/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ListFullyQualifiedTestsArgumentProcessorTests.cs
@@ -80,7 +80,7 @@ public ListFullyQualifiedTestsArgumentProcessorTests()
_mockTestPlatformEventSource = new Mock();
_mockAssemblyMetadataProvider = new Mock();
_mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny())).Returns(Architecture.X64);
- _mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
+ _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
_inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
_mockProcessHelper = new Mock();
_mockAttachmentsProcessingManager = new Mock();
diff --git a/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
index 00ab379e7a..f20f085a44 100644
--- a/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/ListTestsArgumentProcessorTests.cs
@@ -78,7 +78,7 @@ public ListTestsArgumentProcessorTests()
_mockTestPlatformEventSource = new Mock();
_mockAssemblyMetadataProvider = new Mock();
_mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny())).Returns(Architecture.X64);
- _mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
+ _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
_inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
_mockProcessHelper = new Mock();
_mockAttachmentsProcessingManager = new Mock();
diff --git a/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
index f52d438721..27b2fecc04 100644
--- a/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/RunSpecificTestsArgumentProcessorTests.cs
@@ -62,7 +62,7 @@ public RunSpecificTestsArgumentProcessorTests()
_mockAssemblyMetadataProvider = new Mock();
_inferHelper = new InferHelper(_mockAssemblyMetadataProvider.Object);
_mockAssemblyMetadataProvider.Setup(x => x.GetArchitecture(It.IsAny())).Returns(Architecture.X64);
- _mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
+ _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
_mockFileHelper.Setup(fh => fh.Exists(_dummyTestFilePath)).Returns(true);
_mockFileHelper.Setup(x => x.GetCurrentDirectory()).Returns("");
_mockMetricsPublisher = new Mock();
diff --git a/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs b/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
index 9af1218403..4d65a023fa 100644
--- a/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
+++ b/test/vstest.console.UnitTests/Processors/RunTestsArgumentProcessorTests.cs
@@ -69,7 +69,7 @@ public RunTestsArgumentProcessorTests()
SetupMockExtensions();
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.X86);
- _mockAssemblyMetadataProvider.Setup(x => x.GetFrameWork(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
+ _mockAssemblyMetadataProvider.Setup(x => x.GetFrameworkName(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework40));
_mockProcessHelper = new Mock();
_mockAttachmentsProcessingManager = new Mock();
_environment = new Mock();
diff --git a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
index 987709388f..c20819a77c 100644
--- a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
+++ b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
@@ -96,7 +96,7 @@ public TestRequestManagerTests()
.Returns(_mockRunRequest.Object);
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.X86);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework40));
_mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
_mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny())).Returns("dotnet.exe");
@@ -667,7 +667,7 @@ public void DiscoverTestsShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignM
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
DiscoveryCriteria? actualDiscoveryCriteria = null;
var mockDiscoveryRequest = new Mock();
@@ -677,7 +677,7 @@ public void DiscoverTestsShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesignM
_testRequestManager.DiscoverTests(payload, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
Assert.IsTrue(actualDiscoveryCriteria!.RunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
@@ -701,7 +701,7 @@ public void DiscoverTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignM
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.X86);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework451));
DiscoveryCriteria? actualDiscoveryCriteria = null;
var mockDiscoveryRequest = new Mock();
@@ -711,7 +711,7 @@ public void DiscoverTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignM
_testRequestManager.DiscoverTests(payload, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()), Times.Never);
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()), Times.Never);
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()), Times.Never);
Assert.IsTrue(actualDiscoveryCriteria!.RunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
@@ -733,7 +733,7 @@ public void DiscoverTestsShouldUpdateFrameworkAndPlatformInCommandLineScenariosI
_commandLineOptions.IsDesignMode = false;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
DiscoveryCriteria? actualDiscoveryCriteria = null;
var mockDiscoveryRequest = new Mock();
@@ -742,7 +742,7 @@ public void DiscoverTestsShouldUpdateFrameworkAndPlatformInCommandLineScenariosI
_testRequestManager.DiscoverTests(payload, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
Assert.IsTrue(actualDiscoveryCriteria!.RunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualDiscoveryCriteria.RunSettings.Contains(nameof(Architecture.ARM)));
@@ -768,7 +768,7 @@ public void DiscoverTestsShouldNotInferAndUpdateFrameworkAndPlatformInCommandLin
_commandLineOptions.TargetArchitecture = Architecture.X86;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
DiscoveryCriteria? actualDiscoveryCriteria = null;
var mockDiscoveryRequest = new Mock();
@@ -782,7 +782,7 @@ public void DiscoverTestsShouldNotInferAndUpdateFrameworkAndPlatformInCommandLin
// we infer the architecture and framework, so we can print warning when they don't match settings.
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()), Times.Once);
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()), Times.Once);
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()), Times.Once);
// but we don't update the settings, to keep what user specified
Assert.IsFalse(actualDiscoveryCriteria!.RunSettings.Contains(Constants.DotNetFramework46));
@@ -881,7 +881,7 @@ public void RunTestsShouldNotThrowForFramework35()
var mockDiscoveryRequest = new Mock();
_mockTestPlatform.Setup(mt => mt.CreateTestRunRequest(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>())).Callback(
(IRequestData requestData, TestRunCriteria runCriteria, TestPlatformOptions options, Dictionary sourceToSourceDetailMap) => actualTestRunCriteria = runCriteria).Returns(mockDiscoveryRequest.Object);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework35));
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny())).Returns(new FrameworkName(Constants.DotNetFramework35));
var mockRunEventsRegistrar = new Mock();
var mockCustomlauncher = new Mock();
@@ -1397,7 +1397,7 @@ public void RunTestsShouldShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesign
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1407,7 +1407,7 @@ public void RunTestsShouldShouldUpdateFrameworkAndPlatformIfNotSpecifiedInDesign
_testRequestManager.RunTests(payload, new Mock().Object, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
@@ -1434,7 +1434,7 @@ public void RunTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignMode()
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.X86);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework451));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1445,7 +1445,7 @@ public void RunTestsShouldNotUpdateFrameworkAndPlatformIfSpecifiedInDesignMode()
// infer them so we can print warning when dlls are not compatible with runsettings
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()), Times.Once);
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()), Times.Once);
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()), Times.Once);
// but don't update runsettings because we want to keep what user specified
Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(Constants.DotNetFramework46));
@@ -1475,7 +1475,7 @@ public void RunTestsShouldNotUpdatePlatformIfSpecifiedInDesignMode(string target
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.X86);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework451));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1486,7 +1486,7 @@ public void RunTestsShouldNotUpdatePlatformIfSpecifiedInDesignMode(string target
// infer platform and framework so we can print warnings when dlls are not compatible with runsettings
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()), Times.Once);
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()), Times.Once);
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()), Times.Once);
// don't update it in runsettings to keep what user provided
Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(targetPlatform));
@@ -1509,7 +1509,7 @@ public void RunTestsShouldUpdateFrameworkAndPlatformInCommandLineScenarios()
_commandLineOptions.IsDesignMode = false;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1519,7 +1519,7 @@ public void RunTestsShouldUpdateFrameworkAndPlatformInCommandLineScenarios()
_testRequestManager.RunTests(payload, new Mock().Object, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
@@ -1547,7 +1547,7 @@ public void RunTestsShouldNotpdateFrameworkAndPlatformInRunsettingsIfSpecifiedBy
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny()))
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1558,7 +1558,7 @@ public void RunTestsShouldNotpdateFrameworkAndPlatformInRunsettingsIfSpecifiedBy
// infer them so we can print warnings when the assemblies are not compatible
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()), Times.Once);
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()), Times.Once);
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()), Times.Once);
// but don't update them in runsettings so we keep what user specified
Assert.IsFalse(actualTestRunCriteria!.TestRunSettings.Contains(Constants.DotNetFramework46));
@@ -1589,7 +1589,7 @@ public void RunTestsWithTestCasesShouldUpdateFrameworkAndPlatformIfNotSpecifiedI
_commandLineOptions.IsDesignMode = true;
_mockAssemblyMetadataProvider.Setup(a => a.GetArchitecture(It.IsAny())).Callback(archSources.Add)
.Returns(Architecture.ARM);
- _mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny())).Callback(fxSources.Add)
+ _mockAssemblyMetadataProvider.Setup(a => a.GetFrameworkName(It.IsAny())).Callback(fxSources.Add)
.Returns(new FrameworkName(Constants.DotNetFramework46));
TestRunCriteria? actualTestRunCriteria = null;
var mockTestRunRequest = new Mock();
@@ -1599,7 +1599,7 @@ public void RunTestsWithTestCasesShouldUpdateFrameworkAndPlatformIfNotSpecifiedI
_testRequestManager.RunTests(payload, new Mock().Object, new Mock().Object, _protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
Assert.IsTrue(actualTestRunCriteria!.TestRunSettings.Contains(Constants.DotNetFramework46));
Assert.IsTrue(actualTestRunCriteria.TestRunSettings.Contains(nameof(Architecture.ARM)));
@@ -2264,7 +2264,7 @@ public void StartTestSessionShouldUpdateSettings()
a => a.GetArchitecture(It.IsAny()))
.Returns(Architecture.ARM);
_mockAssemblyMetadataProvider.Setup(
- a => a.GetFrameWork(It.IsAny()))
+ a => a.GetFrameworkName(It.IsAny()))
.Returns(new FrameworkName(Constants.DotNetFramework46));
_mockTestPlatform.Setup(
@@ -2288,7 +2288,7 @@ public void StartTestSessionShouldUpdateSettings()
_protocolConfig);
_mockAssemblyMetadataProvider.Verify(a => a.GetArchitecture(It.IsAny()));
- _mockAssemblyMetadataProvider.Verify(a => a.GetFrameWork(It.IsAny()));
+ _mockAssemblyMetadataProvider.Verify(a => a.GetFrameworkName(It.IsAny()));
}
[TestMethod]