Skip to content

Commit 846d10d

Browse files
Add install, update gate tests (#7265)
1 parent 1b7845f commit 846d10d

4 files changed

Lines changed: 65 additions & 32 deletions

File tree

test/NuGet.Tests.Apex/NuGet.Tests.Apex.Daily/NuGetUITestCase.cs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -908,37 +908,6 @@ public async Task VerifyDeletedAssetsFileIsBackByRestoringPackage()
908908
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
909909
}
910910

911-
[TestMethod]
912-
[Timeout(DefaultTimeout)]
913-
public async Task VerifyDeletedAssetsFileIsBackByReloadingProject()
914-
{
915-
// Arrange
916-
await CommonUtility.CreatePackageInSourceAsync(_pathContext.PackageSource, TestPackageName, TestPackageVersionV1);
917-
918-
NuGetApexTestService nugetTestService = GetNuGetTestService();
919-
_pathContext.Settings.SetPackageFormatToPackageReference();
920-
921-
SolutionService solutionService = VisualStudio.Get<SolutionService>();
922-
solutionService.CreateEmptySolution("TestSolution", _pathContext.SolutionRoot);
923-
ProjectTestExtension project = solutionService.AddProject(ProjectLanguage.CSharp, ProjectTemplate.NetCoreConsoleApp, "TestProject");
924-
VisualStudio.ClearOutputWindow();
925-
solutionService.SaveAll();
926-
927-
CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
928-
NuGetUIProjectTestExtension uiwindow = nugetTestService.GetUIWindowfromProject(project);
929-
uiwindow.InstallPackageFromUI(TestPackageName, TestPackageVersionV1);
930-
931-
var assetsFilePath = CommonUtility.GetAssetsFilePath(project.FullPath);
932-
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
933-
File.Delete(assetsFilePath);
934-
935-
// Act
936-
CommonUtility.AutoRestorePackageByReloadingProject(VisualStudio, project);
937-
938-
// Assert
939-
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
940-
}
941-
942911
public override void Dispose()
943912
{
944913
_pathContext.Dispose();

test/NuGet.Tests.Apex/NuGet.Tests.Apex/NuGetEndToEndTests/IVsServicesTestCase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class IVsServicesTestCase : SharedVisualStudioHostTestClass
2525

2626
[TestMethod]
2727
[Timeout(LongerTimeout)]
28-
[TestCategory("Gate")]
2928
public void SimpleInstallFromIVsInstaller()
3029
{
3130
// Arrange

test/NuGet.Tests.Apex/NuGet.Tests.Apex/NuGetEndToEndTests/NetCoreProjectTestCase.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,40 @@ public async Task WithSourceMappingEnabled_InstallPackageFromPMUIAndNoSourcesFou
233233
}
234234
}
235235

236+
[TestMethod]
237+
[Timeout(DefaultTimeout)]
238+
[TestCategory("Gate")]
239+
public async Task InstallAndUpdatePackageFromUI_NetCoreProject_Succeeds()
240+
{
241+
// Arrange
242+
using var testContext = new ApexTestContext(VisualStudio, ProjectTemplate.NetCoreConsoleApp, Logger);
243+
var packageName = "NetCoreUpdateTestPackage";
244+
var packageVersion1 = "1.0.0";
245+
var packageVersion2 = "2.0.0";
246+
247+
await CommonUtility.CreatePackageInSourceAsync(testContext.PackageSource, packageName, packageVersion1);
248+
await CommonUtility.CreatePackageInSourceAsync(testContext.PackageSource, packageName, packageVersion2);
249+
250+
VisualStudio.AssertNoErrors();
251+
252+
// Act
253+
CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
254+
var nugetTestService = GetNuGetTestService();
255+
var uiwindow = nugetTestService.GetUIWindowfromProject(testContext.Project);
256+
uiwindow.InstallPackageFromUI(packageName, packageVersion1);
257+
testContext.SolutionService.Build();
258+
testContext.NuGetApexTestService.WaitForAutoRestore();
259+
CommonUtility.AssertPackageReferenceExists(testContext.Project, packageName, packageVersion1, Logger);
260+
261+
uiwindow.UpdatePackageFromUI(packageName, packageVersion2);
262+
testContext.SolutionService.Build();
263+
testContext.NuGetApexTestService.WaitForAutoRestore();
264+
265+
// Assert
266+
VisualStudio.AssertNuGetOutputDoesNotHaveErrors();
267+
CommonUtility.AssertPackageReferenceExists(testContext.Project, packageName, packageVersion2, Logger);
268+
}
269+
236270
// There is a bug with VS or Apex where NetCoreConsoleApp and NetCoreClassLib create netcore 2.1 projects that are not supported by the sdk
237271
// Commenting out any NetCoreConsoleApp or NetCoreClassLib template and swapping it for NetStandardClassLib as both are package ref.
238272

test/NuGet.Tests.Apex/NuGet.Tests.Apex/NuGetEndToEndTests/NuGetUITestCase.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,37 @@ public async Task UpdatePackageFromUI_PC_PackageSourceMapping_WithMultiFeed_Succ
371371
CommonUtility.AssertPackageInPackagesConfig(VisualStudio, project, TestPackageName, TestPackageVersionV2, Logger);
372372
}
373373

374+
[TestMethod]
375+
[Timeout(DefaultTimeout)]
376+
[TestCategory("Gate")]
377+
public async Task VerifyDeletedAssetsFileIsBackByReloadingProject()
378+
{
379+
// Arrange
380+
await CommonUtility.CreatePackageInSourceAsync(_pathContext.PackageSource, TestPackageName, TestPackageVersionV1);
381+
382+
NuGetApexTestService nugetTestService = GetNuGetTestService();
383+
384+
SolutionService solutionService = VisualStudio.Get<SolutionService>();
385+
solutionService.CreateEmptySolution("TestSolution", _pathContext.SolutionRoot);
386+
ProjectTestExtension project = solutionService.AddProject(ProjectLanguage.CSharp, ProjectTemplate.NetCoreConsoleApp, "TestProject");
387+
VisualStudio.ClearOutputWindow();
388+
solutionService.SaveAll();
389+
390+
CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
391+
NuGetUIProjectTestExtension uiwindow = nugetTestService.GetUIWindowfromProject(project);
392+
uiwindow.InstallPackageFromUI(TestPackageName, TestPackageVersionV1);
393+
394+
var assetsFilePath = CommonUtility.GetAssetsFilePath(project.FullPath);
395+
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
396+
File.Delete(assetsFilePath);
397+
398+
// Act
399+
CommonUtility.AutoRestorePackageByReloadingProject(VisualStudio, project);
400+
401+
// Assert
402+
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
403+
}
404+
374405
public override void Dispose()
375406
{
376407
_pathContext.Dispose();

0 commit comments

Comments
 (0)