From dea34d33955a3d08e41103363819f7fd60488598 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Tue, 28 Jun 2011 19:50:49 +0100 Subject: [PATCH] Show project name in Manage Packages dialog title. --- .../Cmdlets/Test/Src/GetPackageCmdletTests.cs | 2 +- .../Design/FakePackageManagementProject.cs | 4 ++ .../Design/FakePackageManagementSolution.cs | 12 ++-- .../Project/Src/IPackageManagementProject.cs | 3 +- .../Project/Src/ManagePackagesView.cs | 2 +- .../Project/Src/ManagePackagesView.xaml | 14 +++-- .../Project/Src/ManagePackagesViewModel.cs | 10 ++++ .../Project/Src/PackageManagementProject.cs | 4 ++ .../Src/Helpers/TestablePackageViewModel.cs | 4 +- .../Src/InstalledPackagesViewModelTests.cs | 8 +-- .../Test/Src/ManagePackagesViewModelTests.cs | 17 +++++- .../Test/Src/PackageManagementProjectTests.cs | 57 ++++++++++++------- .../Test/Src/PackageViewModelTests.cs | 16 +++--- .../PackageManagementConsoleHostTests.cs | 4 +- .../Test/Src/UpdatedPackageViewModelTests.cs | 2 +- .../Test/Src/UpdatedPackagesViewModelTests.cs | 2 +- 16 files changed, 106 insertions(+), 55 deletions(-) diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs index 9da7680ed8..abbe6e2fcc 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs @@ -26,7 +26,7 @@ namespace PackageManagement.Cmdlets.Tests fakeSolution = new FakePackageManagementSolution(); fakeRegisteredPackageRepositories = cmdlet.FakeRegisteredPackageRepositories; fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost; - fakeConsoleHost.FakeProject = fakeSolution.FakeProject; + fakeConsoleHost.FakeProject = fakeSolution.FakeActiveProject; fakeCommandRuntime = cmdlet.FakeCommandRuntime; fakeTerminatingError = cmdlet.FakeCmdletTerminatingError; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs index 172f4ae7bc..10ef82c37b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs @@ -18,12 +18,16 @@ namespace ICSharpCode.PackageManagement.Design FakeInstallPackageAction = new FakeInstallPackageAction(this); FakeUninstallPackageAction = new FakeUninstallPackageAction(this); FakeUpdatePackageAction = new FakeUpdatePackageAction(this); + + Name = "Test"; } public FakeInstallPackageAction FakeInstallPackageAction; public FakeUpdatePackageAction FakeUpdatePackageAction; public FakeUninstallPackageAction FakeUninstallPackageAction; + public string Name { get; set; } + public bool IsInstalledReturnValue; public IPackage PackagePassedToIsInstalled; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs index a96687ca0b..84385969d2 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.PackageManagement.Design { public void AddPackageToActiveProjectLocalRepository(FakePackage package) { - FakeProject.FakePackages.Add(package); + FakeActiveProject.FakePackages.Add(package); } public FakePackage AddPackageToActiveProjectLocalRepository(string packageId) @@ -26,13 +26,13 @@ namespace ICSharpCode.PackageManagement.Design } public int GetActiveProjectCallCount; - public FakePackageManagementProject FakeProject = new FakePackageManagementProject(); + public FakePackageManagementProject FakeActiveProject = new FakePackageManagementProject(); public virtual IPackageManagementProject GetActiveProject() { GetActiveProjectCallCount++; - return FakeProject; + return FakeActiveProject; } public IPackageRepository RepositoryPassedToGetActiveProject; @@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.Design public virtual IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository) { RepositoryPassedToGetActiveProject = sourceRepository; - return FakeProject; + return FakeActiveProject; } public PackageSource PackageSourcePassedToGetProject; @@ -50,7 +50,7 @@ namespace ICSharpCode.PackageManagement.Design { PackageSourcePassedToGetProject = source; ProjectNamePassedToGetProject = projectName; - return FakeProject; + return FakeActiveProject; } public IPackageRepository RepositoryPassedToGetProject; @@ -59,7 +59,7 @@ namespace ICSharpCode.PackageManagement.Design { RepositoryPassedToGetProject = sourceRepository; ProjectNamePassedToGetProject = projectName; - return FakeProject; + return FakeActiveProject; } public List FakeMSBuildProjects = new List(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs index dd075f3612..d40722e904 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs @@ -16,7 +16,8 @@ namespace ICSharpCode.PackageManagement event EventHandler PackageUninstalled; event EventHandler PackageReferenceAdded; event EventHandler PackageReferenceRemoved; - + + string Name { get; } ILogger Logger { get; set; } IPackageRepository SourceRepository { get; } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.cs b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.cs index b26daa2a72..9e00d298a8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.PackageManagement public void Dispose() { - var viewModel = MainPanel.DataContext as ManagePackagesViewModel; + var viewModel = DataContext as ManagePackagesViewModel; viewModel.Dispose(); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml index 2dfa214e7a..ae5a8d56d2 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml +++ b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml @@ -9,7 +9,6 @@ MinHeight="380" MinWidth="440" Style="{x:Static core:GlobalStyles.DialogWindowStyle}" - Title="Manage Packages" WindowStartupLocation="CenterOwner"> @@ -21,12 +20,15 @@ UriSource="pack://application:,,,/PackageManagement;component/Resources/exclamation.png"/> + + + + + + + + - - - - diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesViewModel.cs index ede3b1c234..1561516ccb 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesViewModel.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesViewModel.cs @@ -52,6 +52,16 @@ namespace ICSharpCode.PackageManagement public RecentPackagesViewModel RecentPackagesViewModel { get; private set; } public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; private set; } + public string Title { + get { return GetTitle(); } + } + + string GetTitle() + { + IPackageManagementProject project = solution.GetActiveProject(); + return String.Format("{0} - Manage Packages", project.Name); + } + public void Dispose() { AvailablePackagesViewModel.Dispose(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs index f401e53117..3caf3aa0a2 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs @@ -32,6 +32,10 @@ namespace ICSharpCode.PackageManagement projectManager = packageManager.ProjectManager; } + public string Name { + get { return msbuildProject.Name; } + } + public IPackageRepository SourceRepository { get; private set; } public ILogger Logger { diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs index 2ad91486d8..4add943220 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs @@ -62,7 +62,7 @@ namespace PackageManagement.Tests.Helpers var operation = new PackageOperation(FakePackage, PackageAction.Install); FakeSolution - .FakeProject + .FakeActiveProject .FakeInstallOperations .Add(operation); @@ -73,7 +73,7 @@ namespace PackageManagement.Tests.Helpers { var package = new FakePackage("PackageToUninstall"); var operation = new PackageOperation(package, PackageAction.Uninstall); - FakeSolution.FakeProject.FakeInstallOperations.Add(operation); + FakeSolution.FakeActiveProject.FakeInstallOperations.Add(operation); return operation; } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs index 8e7fb13423..6cc1cadc29 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs @@ -65,7 +65,7 @@ namespace PackageManagement.Tests FakePackage AddPackageToProjectLocalRepository() { var package = new FakePackage("Test"); - solution.FakeProject.FakePackages.Add(package); + solution.FakeActiveProject.FakePackages.Add(package); return package; } @@ -93,7 +93,7 @@ namespace PackageManagement.Tests viewModel.ReadPackages(); CompleteReadPackagesTask(); - solution.FakeProject.FakePackages.Clear(); + solution.FakeActiveProject.FakePackages.Clear(); ClearReadPackagesTasks(); packageManagementEvents.OnParentPackageUninstalled(new FakePackage()); @@ -122,7 +122,7 @@ namespace PackageManagement.Tests CreateViewModel(solution); viewModel.ReadPackages(); - solution.FakeProject = null; + solution.FakeActiveProject = null; CompleteReadPackagesTask(); Assert.AreEqual(1, viewModel.PackageViewModels.Count); @@ -152,7 +152,7 @@ namespace PackageManagement.Tests viewModel.ReadPackages(); CompleteReadPackagesTask(); - solution.FakeProject.FakePackages.Clear(); + solution.FakeActiveProject.FakePackages.Clear(); ClearReadPackagesTasks(); viewModel.Dispose(); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs index 368ce29a4d..487bd905f3 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs @@ -110,10 +110,10 @@ namespace PackageManagement.Tests { CreateSolution(); FakePackage package = new FakePackage(); - fakeSolution.FakeProject.FakePackages.Add(package); + fakeSolution.FakeActiveProject.FakePackages.Add(package); CreateViewModel(fakeSolution); - IEnumerable expectedPackages = fakeSolution.FakeProject.FakePackages; + IEnumerable expectedPackages = fakeSolution.FakeActiveProject.FakePackages; IEnumerable actualPackageViewModels = viewModel.InstalledPackagesViewModel.PackageViewModels; PackageCollectionAssert.AreEqual(expectedPackages, actualPackageViewModels); @@ -370,5 +370,18 @@ namespace PackageManagement.Tests Assert.IsTrue(disposed); } + + [Test] + public void Title_ProjectSelected_ReturnsProjectInTitle() + { + CreateViewModel(); + fakeSolution.FakeActiveProject.Name = "Test"; + + string title = viewModel.Title; + + string expectedTitle = "Test - Manage Packages"; + + Assert.AreEqual(expectedTitle, title); + } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs index e8778514ea..80acc173e7 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs @@ -3,8 +3,12 @@ using System; using System.Collections.Generic; +using System.Linq; + using ICSharpCode.PackageManagement; using ICSharpCode.PackageManagement.Design; +using ICSharpCode.PackageManagement.EnvDTE; +using ICSharpCode.SharpDevelop.Project; using NuGet; using NUnit.Framework; using PackageManagement.Tests.Helpers; @@ -70,7 +74,7 @@ namespace PackageManagement.Tests var expectedPackage = new FakePackage("Test"); project.IsInstalled(expectedPackage); - var actualPackage = fakeProjectManager.PackagePassedToIsInstalled; + IPackage actualPackage = fakeProjectManager.PackagePassedToIsInstalled; Assert.AreEqual(expectedPackage, actualPackage); } @@ -79,7 +83,7 @@ namespace PackageManagement.Tests public void Constructor_RepositoryAndProjectPassed_RepositoryUsedToCreatePackageManager() { CreateProject(); - var actualrepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager; + IPackageRepository actualrepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager; Assert.AreEqual(fakeSourceRepository, actualrepository); } @@ -88,7 +92,7 @@ namespace PackageManagement.Tests public void Constructor_RepositoryAndProjectPassed_ProjecUsedToCreatePackageManager() { CreateProject(); - var actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository; + MSBuildBasedProject actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository; Assert.AreEqual(fakeMSBuildProject, actualProject); } @@ -97,11 +101,11 @@ namespace PackageManagement.Tests public void GetPackages_ProjectManagerLocalRepositoryHasTwoPackages_ReturnsTwoPackages() { CreateProject(); - var repository = fakeProjectManager.FakeLocalRepository; - var packageA = repository.AddFakePackage("A"); - var packageB = repository.AddFakePackage("B"); + FakePackageRepository repository = fakeProjectManager.FakeLocalRepository; + FakePackage packageA = repository.AddFakePackage("A"); + FakePackage packageB = repository.AddFakePackage("B"); - var actualPackages = project.GetPackages(); + IQueryable actualPackages = project.GetPackages(); var expectedPackages = new FakePackage[] { packageA, @@ -141,7 +145,7 @@ namespace PackageManagement.Tests project.GetInstallPackageOperations(expectedPackage, true); - var actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations; + IPackage actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations; Assert.AreEqual(expectedPackage, actualPackage); } @@ -152,9 +156,9 @@ namespace PackageManagement.Tests CreateProject(); var package = new FakePackage(); - var operations = project.GetInstallPackageOperations(package, true); + IEnumerable operations = project.GetInstallPackageOperations(package, true); - var expectedOperations = fakePackageManager.PackageOperationsToReturnFromGetInstallPackageOperations; + IEnumerable expectedOperations = fakePackageManager.PackageOperationsToReturnFromGetInstallPackageOperations; Assert.AreEqual(expectedOperations, operations); } @@ -175,8 +179,8 @@ namespace PackageManagement.Tests { CreateProject(); - var logger = project.Logger; - var expectedLogger = fakePackageManager.Logger; + ILogger logger = project.Logger; + ILogger expectedLogger = fakePackageManager.Logger; Assert.AreEqual(expectedLogger, logger); } @@ -189,7 +193,7 @@ namespace PackageManagement.Tests project.InstallPackage(package, null, true); - var expectedPackage = fakePackageManager.PackagePassedToInstallPackage; + IPackage expectedPackage = fakePackageManager.PackagePassedToInstallPackage; Assert.AreEqual(expectedPackage, package); } @@ -219,7 +223,7 @@ namespace PackageManagement.Tests var expectedOperations = new List(); project.InstallPackage(null, expectedOperations, false); - var actualOperations = fakePackageManager.PackageOperationsPassedToInstallPackage; + IEnumerable actualOperations = fakePackageManager.PackageOperationsPassedToInstallPackage; Assert.AreEqual(expectedOperations, actualOperations); } @@ -228,7 +232,7 @@ namespace PackageManagement.Tests public void SourceRepository_NewInstance_ReturnsRepositoryUsedToCreateInstance() { CreateProject(); - var repository = project.SourceRepository; + IPackageRepository repository = project.SourceRepository; Assert.AreEqual(fakeSourceRepository, repository); } @@ -241,7 +245,7 @@ namespace PackageManagement.Tests project.UninstallPackage(package, true, true); - var expectedPackage = fakePackageManager.PackagePassedToUninstallPackage; + IPackage expectedPackage = fakePackageManager.PackagePassedToUninstallPackage; Assert.AreEqual(expectedPackage, package); } @@ -290,7 +294,7 @@ namespace PackageManagement.Tests project.UpdatePackage(package, null, true); - var expectedPackage = fakePackageManager.PackagePassedToUpdatePackage; + IPackage expectedPackage = fakePackageManager.PackagePassedToUpdatePackage; Assert.AreEqual(expectedPackage, package); } @@ -320,7 +324,7 @@ namespace PackageManagement.Tests var expectedOperations = new List(); project.UpdatePackage(null, expectedOperations, false); - var actualOperations = fakePackageManager.PackageOperationsPassedToUpdatePackage; + IEnumerable actualOperations = fakePackageManager.PackageOperationsPassedToUpdatePackage; Assert.AreEqual(expectedOperations, actualOperations); } @@ -426,9 +430,22 @@ namespace PackageManagement.Tests { CreateProject(); fakeMSBuildProject.Name = "Test"; - var dteProject = project.ConvertToDTEProject(); + Project dteProject = project.ConvertToDTEProject(); + + string name = dteProject.Name; + + Assert.AreEqual("Test", name); + } + + [Test] + public void Name_MSBuildProjectNameIsSet_ReturnsMSBuildProjectName() + { + CreateProject(); + fakeMSBuildProject.Name = "MyProject"; + + string name = project.Name; - Assert.AreEqual("Test", dteProject.Name); + Assert.AreEqual("MyProject", name); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs index 7e551a0232..4e16dcb0c9 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs @@ -41,7 +41,7 @@ namespace PackageManagement.Tests { CreateViewModel(); exceptionThrowingProject = new ExceptionThrowingPackageManagementProject(); - viewModel.FakeSolution.FakeProject = exceptionThrowingProject; + viewModel.FakeSolution.FakeActiveProject = exceptionThrowingProject; } void CreateViewModel(FakePackageManagementSolution solution) @@ -51,8 +51,8 @@ namespace PackageManagement.Tests this.fakeSolution = solution; packageManagementEvents = viewModel.FakePackageManagementEvents; fakeLogger = viewModel.FakeLogger; - fakeInstallPackageAction = solution.FakeProject.FakeInstallPackageAction; - fakeUninstallPackageAction = solution.FakeProject.FakeUninstallPackageAction; + fakeInstallPackageAction = solution.FakeActiveProject.FakeInstallPackageAction; + fakeUninstallPackageAction = solution.FakeActiveProject.FakeUninstallPackageAction; fakeActionRunner = viewModel.FakeActionRunner; } @@ -189,7 +189,7 @@ namespace PackageManagement.Tests public void IsAdded_ProjectHasPackageAdded_ReturnsTrue() { CreateViewModel(); - fakeSolution.FakeProject.IsInstalledReturnValue = true; + fakeSolution.FakeActiveProject.IsInstalledReturnValue = true; Assert.IsTrue(viewModel.IsAdded); } @@ -198,7 +198,7 @@ namespace PackageManagement.Tests public void IsAdded_ProjectDoesNotHavePackageInstalled_ReturnsFalse() { CreateViewModel(); - fakeSolution.FakeProject.IsInstalledReturnValue = false; + fakeSolution.FakeActiveProject.IsInstalledReturnValue = false; Assert.IsFalse(viewModel.IsAdded); } @@ -407,7 +407,7 @@ namespace PackageManagement.Tests viewModel.AddPackage(); ILogger expectedLogger = viewModel.OperationLoggerCreated; - ILogger actualLogger = fakeSolution.FakeProject.Logger; + ILogger actualLogger = fakeSolution.FakeActiveProject.Logger; Assert.AreEqual(expectedLogger, actualLogger); } @@ -585,7 +585,7 @@ namespace PackageManagement.Tests var expectedPackage = package; var actualPackage = fakeSolution - .FakeProject + .FakeActiveProject .PackagePassedToGetInstallPackageOperations; Assert.AreEqual(expectedPackage, actualPackage); @@ -599,7 +599,7 @@ namespace PackageManagement.Tests viewModel.AddPackage(); bool result = fakeSolution - .FakeProject + .FakeActiveProject .IgnoreDependenciesPassedToGetInstallPackageOperations; Assert.IsFalse(result); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs index 523fcb21a9..9d483b88c4 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs @@ -380,7 +380,7 @@ namespace PackageManagement.Tests.Scripting IPackageManagementProject project = host.GetProject(source, "Test"); - FakePackageManagementProject expectedProject = fakeSolution.FakeProject; + FakePackageManagementProject expectedProject = fakeSolution.FakeActiveProject; Assert.AreEqual(expectedProject, project); } @@ -450,7 +450,7 @@ namespace PackageManagement.Tests.Scripting IPackageManagementProject project = host.GetProject(repository, "Test"); - var expectedProject = fakeSolution.FakeProject; + var expectedProject = fakeSolution.FakeActiveProject; Assert.AreEqual(expectedProject, project); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs index 35ea47d6bb..ec0d17bf14 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs @@ -23,7 +23,7 @@ namespace PackageManagement.Tests { viewModel = new TestableUpdatedPackageViewModel(); fakeSolution = viewModel.FakeSolution; - fakeProject = fakeSolution.FakeProject; + fakeProject = fakeSolution.FakeActiveProject; updatePackageAction = fakeProject.FakeUpdatePackageAction; fakeActionRunner = viewModel.FakeActionRunner; } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs index 3cccec7fb3..f778cbc0f2 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs @@ -108,7 +108,7 @@ namespace PackageManagement.Tests viewModel.ReadPackages(); registeredPackageRepositories.FakeAggregateRepository = null; - solution.FakeProject = null; + solution.FakeActiveProject = null; CompleteReadPackagesTask(); Assert.AreEqual(1, viewModel.PackageViewModels.Count);