Skip to content

Use Combinatorial.MSTest for boolean DataRow tests in dotnet.Tests #55015

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

Draft
Evangelink wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use Combinatorial.MSTest for boolean DataRow tests in dotnet.Tests #55015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions test/dotnet.Tests/CommandTests/Publish/GivenDotnetPublishPublishesProjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,7 @@ public void ItFailsToPublishWithNoBuildIfNotPreviouslyBuilt()
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void ItPublishesSuccessfullyWithNoBuildIfPreviouslyBuilt(bool selfContained)
{
var testInstance = TestAssetsManager.CopyTestAsset("TestAppSimple", identifier: selfContained.ToString())
Expand Down
3 changes: 1 addition & 2 deletions test/dotnet.Tests/CommandTests/Reference/Add/GivenDotnetAddReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,7 @@ public void WhenFrameworkSwitchIsNotMatchingAnyOfTargetedFrameworksItPrintsError
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void WhenIncompatibleFrameworkDetectedItPrintsError(bool useFrameworkArg)
{
var setup = Setup(useFrameworkArg.ToString());
Expand Down
9 changes: 3 additions & 6 deletions test/dotnet.Tests/CommandTests/Restore/GivenThatIWantToRestoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ public GivenThatIWantToRestoreApp()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ItRestoresAppToSpecificDirectory(bool useStaticGraphEvaluation)
{
var rootPath = TestAssetsManager.CreateTestDirectory(identifier: useStaticGraphEvaluation.ToString()).Path;
Expand Down Expand Up @@ -97,8 +96,7 @@ public void ItRestoresLibToSpecificDirectory(bool useStaticGraphEvaluation, stri
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ItRestoresTestAppToSpecificDirectory(bool useStaticGraphEvaluation)
{
var rootPath = TestAssetsManager.CopyTestAsset("VSTestCore", identifier: useStaticGraphEvaluation.ToString())
Expand All @@ -123,8 +121,7 @@ public void ItRestoresTestAppToSpecificDirectory(bool useStaticGraphEvaluation)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ItRestoresWithTheSpecifiedVerbosity(bool useStaticGraphEvaluation)
{
var rootPath = TestAssetsManager.CreateTestDirectory(identifier: useStaticGraphEvaluation.ToString()).Path;
Expand Down
3 changes: 1 addition & 2 deletions test/dotnet.Tests/CommandTests/Sdk/Check/GivenDotnetSdkCheck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void WhenNewFeatureBandExistsItIsAdvertised(bool newerBandExists)
{
var parseResult = Parser.Parse(new string[] { "dotnet", "sdk", "check" });
Expand Down
9 changes: 3 additions & 6 deletions test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsArtifactPostProcessing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public GivenDotnetTestBuildsAndRunsArtifactPostProcessing()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ArtifactPostProcessing_SolutionProjects(bool merge)
{
TestAsset testInstance = TestAssetsManager.CopyTestAsset("VSTestMultiProjectSolution", Guid.NewGuid().ToString())
Expand All @@ -47,8 +46,7 @@ public void ArtifactPostProcessing_SolutionProjects(bool merge)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ArtifactPostProcessing_TestContainers(bool merge)
{
TestAsset testInstance = TestAssetsManager.CopyTestAsset("VSTestMultiProjectSolution", Guid.NewGuid().ToString())
Expand Down Expand Up @@ -76,8 +74,7 @@ public void ArtifactPostProcessing_TestContainers(bool merge)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void ArtifactPostProcessing_VSTest_TestContainers(bool merge)
{
TestAsset testInstance = TestAssetsManager.CopyTestAsset("VSTestMultiProjectSolution", Guid.NewGuid().ToString())
Expand Down
3 changes: 1 addition & 2 deletions test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsForMultipleTFMs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ public void RunProjectWithMultipleTFMs_ShouldReturnExitCodeGenericFailure(string
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void RunProjectWithMultipleTFMs_ParallelizationTest_RunInParallelShouldFail(bool testTfmsInParallel)
{
TestAsset testInstance = TestAssetsManager.CopyTestAsset("TestProjectWithMultipleTFMsParallelization", Guid.NewGuid().ToString())
Expand Down
8 changes: 2 additions & 6 deletions test/dotnet.Tests/CommandTests/Workload/Clean/GivenDotnetWorkloadClean.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ public GivenDotnetWorkloadClean()
}

[TestMethod]
[DataRow(true, true)]
[DataRow(false, true)]
[DataRow(true, false)]
[DataRow(false, false)]
[CombinatorialData]
public void GivenWorkloadCleanFileBasedItRemovesPacksAndPackRecords(bool userLocal, bool cleanAll)
{
var (testDirectory, dotnetRoot, userProfileDir, workloadResolver, nugetDownloader) = Setup(userLocal, cleanAll);
Expand Down Expand Up @@ -76,8 +73,7 @@ public void GivenWorkloadCleanFileBasedItRemovesPacksAndPackRecords(bool userLoc
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadCleanAllFileBasedItCleansAllFeatureBands(bool userLocal)
{
var (testDirectory, dotnetRoot, userProfileDir, workloadResolver, nugetDownloader) = Setup(userLocal, true);
Expand Down
3 changes: 1 addition & 2 deletions test/dotnet.Tests/CommandTests/Workload/Install/GivenDotnetWorkloadInstall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,7 @@ public void GivenWorkloadInstallItErrorsOnUnsupportedPlatform()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadInstallItDoesNotRemoveOldInstallsOnRollback(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down
9 changes: 3 additions & 6 deletions test/dotnet.Tests/CommandTests/Workload/Install/GivenWorkloadManifestUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@ public void GivenAdvertisedManifestsItCalculatesCorrectUpdates()
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public async Task ItCanFallbackAndAdvertiseCorrectUpdate(bool useOfflineCache)
{
// Currently installed - 6.0.200 workload manifest
Expand Down Expand Up @@ -285,8 +284,7 @@ public async Task ItCanFallbackAndAdvertiseCorrectUpdate(bool useOfflineCache)
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public async Task ItCanFallbackWithNoUpdates(bool useOfflineCache)
{
// Currently installed - none
Expand Down Expand Up @@ -351,8 +349,7 @@ public async Task ItCanFallbackWithNoUpdates(bool useOfflineCache)
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public async Task GivenNoUpdatesAreAvailableAndNoRollbackItGivesAppropriateMessage(bool useOfflineCache)
{
// Currently installed - none
Expand Down
12 changes: 4 additions & 8 deletions test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public GivenDotnetWorkloadRepair()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenNoWorkloadsAreInstalledRepairIsNoOp(bool userLocal)
{
_reporter.Clear();
Expand All @@ -58,8 +57,7 @@ public void GivenNoWorkloadsAreInstalledRepairIsNoOp(bool userLocal)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenExtraPacksInstalledRepairGarbageCollects(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down Expand Up @@ -108,8 +106,7 @@ public void GivenExtraPacksInstalledRepairGarbageCollects(bool userLocal)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenMissingPacksRepairFixesInstall(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down Expand Up @@ -155,8 +152,7 @@ public void GivenMissingPacksRepairFixesInstall(bool userLocal)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenMissingManifestsInWorkloadSetModeRepairReinstallsManifests(bool userLocal)
{
var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) =
Expand Down
9 changes: 3 additions & 6 deletions test/dotnet.Tests/CommandTests/Workload/Uninstall/GivenDotnetWorkloadUninstall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public void GivenWorkloadUninstallItErrorsWhenWorkloadIsNotInstalled()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadUninstallItCanUninstallWorkload(bool userLocal)
{
var installingWorkload = "mock-1";
Expand Down Expand Up @@ -96,8 +95,7 @@ public void GivenWorkloadUninstallItWorksWithVerbosityFlag()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadUninstallItCanUninstallOnlySpecifiedWorkload(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down Expand Up @@ -140,8 +138,7 @@ public void GivenWorkloadUninstallItCanUninstallOnlySpecifiedWorkload(bool userL
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadUninstallItCanUninstallOnlySpecifiedFeatureBand(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down
9 changes: 3 additions & 6 deletions test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ public void GivenWorkloadUpdateFromHistory()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadUpdateItRemovesOldPacksAfterInstall(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down Expand Up @@ -197,8 +196,7 @@ public void GivenWorkloadUpdateItRemovesOldPacksAfterInstall(bool userLocal)
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenWorkloadUpdateAcrossFeatureBandsItUpdatesPacks(bool userLocal)
{
var testDirectory = TestAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path;
Expand Down Expand Up @@ -663,8 +661,7 @@ public void GivenInvalidVersionInRollbackFileItErrors()
}

[TestMethod]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void GivenMissingManifestsInWorkloadSetModeUpdateReinstallsManifests(bool userLocal)
{
var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) =
Expand Down
3 changes: 1 addition & 2 deletions test/dotnet.Tests/PackagedCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public void TestProjectToolIsAvailableThroughDriver(string appName)

[TestMethod]
[RequiresSpecificFramework("netcoreapp1.1")]
[DataRow(true)]
[DataRow(false)]
[CombinatorialData]
public void IfPreviousVersionOfSharedFrameworkIsInstalled_ToolsTargetingItRun(bool toolPrefersCLIRuntime)
{
var testInstance = TestAssetsManager.CopyTestAsset("AppWithToolDependency", identifier: toolPrefersCLIRuntime ? "preferCLIRuntime" : "")
Expand Down
18 changes: 6 additions & 12 deletions test/dotnet.Tests/ShellShimTests/ShellShimRepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ public void GivenAShimItPassesThroughArguments(string arguments, string[] expect
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenAShimConflictItWillRollback(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand Down Expand Up @@ -177,8 +176,7 @@ public void GivenAShimConflictItWillRollback(bool testMockBehaviorIsInSync)
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenAnExceptionItWillRollback(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand Down Expand Up @@ -220,8 +218,7 @@ public void GivenAnExceptionItWillRollback(bool testMockBehaviorIsInSync)
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenANonexistentShimRemoveDoesNotThrow(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand All @@ -247,8 +244,7 @@ public void GivenANonexistentShimRemoveDoesNotThrow(bool testMockBehaviorIsInSyn
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenAnInstalledShimRemoveDeletesTheShimFiles(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand Down Expand Up @@ -278,8 +274,7 @@ public void GivenAnInstalledShimRemoveDeletesTheShimFiles(bool testMockBehaviorI
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenAnInstalledShimRemoveRollsbackIfTransactionIsAborted(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand Down Expand Up @@ -316,8 +311,7 @@ public void GivenAnInstalledShimRemoveRollsbackIfTransactionIsAborted(bool testM
}

[TestMethod]
[DataRow(false)]
[DataRow(true)]
[CombinatorialData]
public void GivenAnInstalledShimRemoveCommitsIfTransactionIsCompleted(bool testMockBehaviorIsInSync)
{
var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
Expand Down
Loading