PackageManagement: Make Tests Testable

Dragan · Dragan · commit 2ce903b17165 · 2014-02-20T16:50:57.000+01:00
1) Enable testable derivations for previous commit changes
2) Tests: Make new and extend existing testable classes/derivations
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
@@ -108,9 +108,10 @@ protected override IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(
 					.DistinctLast<IPackage>(PackageEqualityComparer.Id);
 			}
 			if (project != null) {
-				filteredPackages = filteredPackages.Where(package => package.HasProjectContent());
+				filteredPackages = filteredPackages.Where(IsProjectPackage);
 			}
 			return filteredPackages;
 		}
+
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs b/src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs
@@ -66,8 +66,6 @@ public static FakePackage CreatePackageWithVersion(string id, string version)
 			return new FakePackage(id, version);
 		}
 		
-		public bool IsProjectPackage { get { return true; } }
-		
 		public string Id { get; set; }
 		public SemanticVersion Version { get; set; }
 		public string Title { get; set; }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageExtensions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageExtensions.cs
@@ -42,5 +42,10 @@ public static string GetName(this IPackage package)
 				return package.Id;
 			return package.Title;
 		}
+
+		public static bool IsProjectPackage(this IPackage package)
+		{
+			return package.HasProjectContent();
+		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/IPackageFromRepository.cs b/src/AddIns/Misc/PackageManagement/Project/Src/IPackageFromRepository.cs
@@ -27,6 +27,5 @@ public interface IPackageFromRepository : IPackage
 		bool HasDependencies { get; }
 		DateTime? LastUpdated { get; }
 		Uri GalleryUrl { get; }
-		bool IsProjectPackage { get; }
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs
@@ -36,8 +36,6 @@ public PackageFromRepository(IPackage package, IPackageRepository repository)
 			this.Repository = repository;
 		}
 
-		public bool IsProjectPackage { get { return this.HasProjectContent(); } }
-
 		public IPackageRepository Repository { get; private set; }
 		
 		public IEnumerable<IPackageAssemblyReference> AssemblyReferences {
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs
@@ -119,7 +119,7 @@ public bool IsAdded {
 			get {
 				if (selectedProjects.HasSingleProjectSelected()) {
 					return selectedProjects.GetSingleProjectSelected(package.Repository).IsPackageInstalled(package)
-						|| (IsPackageInstalled() && !package.IsProjectPackage);
+						|| (IsPackageInstalled() && !IsProjectPackage(package));
 				}
 				return IsPackageInstalled();
 			}
@@ -198,14 +198,23 @@ public bool HasLastPublished {
 			get { return package.Published.HasValue; }
 		}
 
+		/// <summary>
+		/// Make this & IPackageExtensions.IsProjectPackage overridable/testable
+		/// </summary>
+		/// <param name="package"></param>
+		/// <returns></returns>
+		protected virtual bool IsProjectPackage(IPackage package) {
+			return package.IsProjectPackage();
+		}
+
 		public void PackageChanged() {
 			OnPropertyChanged(model => model.IsManaged);
 			OnPropertyChanged(model => model.IsAdded);
 		}
 
 		public void AddOrManagePackage() {
 			if (selectedProjects.HasMultipleProjects()) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					ManagePackage();
 				}
 				else {
@@ -223,7 +232,7 @@ public void AddPackage()
 			logger.LogAddingPackage();
 			
 			using (IDisposable operation = StartOperation(package)) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					TryInstallingPackage();
 				}
 				else {
@@ -367,7 +376,7 @@ void ReportError(Exception ex)
 		
 		public void RemoveOrManagePackage() {
 			if (selectedProjects.HasMultipleProjects()) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					ManagePackage();
 				}
 				else {
@@ -384,7 +393,7 @@ public void RemovePackage()
 			ClearReportedMessages();
 			logger.LogRemovingPackage();
 
-			if (package.IsProjectPackage) {
+			if (IsProjectPackage(package)) {
 				TryUninstallingPackage();
 			} else {
 				TryUninstallingSolutionPackage();
@@ -434,7 +443,7 @@ public bool IsManaged {
 				// Solution selected 
 				// Project-level/Solution-level Package Management
 				if (IsAdded) {
-					if (package.IsProjectPackage) {
+					if (IsProjectPackage(package)) {
 						return true; // [Manage] Button
 					}
 					return false; // [Remove] Button
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs
@@ -266,6 +266,15 @@ protected virtual IQueryable<IPackage> GetAllPackages()
 			return null;
 		}
 		
+		/// <summary>
+		/// Make this & IPackageExtensions.IsProjectPackage overridable/testable
+		/// </summary>
+		/// <param name="package"></param>
+		/// <returns></returns>
+		protected virtual bool IsProjectPackage (IPackage package) {
+			return package.IsProjectPackage();
+		}
+		
 		/// <summary>
 		/// Allows filtering of the packages before paging the results. Call base class method
 		/// to run default filtering.
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModels.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModels.cs
@@ -22,6 +22,8 @@ namespace ICSharpCode.PackageManagement
 {
 	public class PackagesViewModels : IDisposable
 	{
+		protected PackagesViewModels() {}
+		
 		public PackagesViewModels(
 			IPackageManagementSolution solution,
 			IRegisteredPackageRepositories registeredPackageRepositories,
@@ -38,10 +40,10 @@ public PackagesViewModels(
 			RecentPackagesViewModel = new RecentPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
 		}
 		
-		public AvailablePackagesViewModel AvailablePackagesViewModel { get; private set; }
-		public InstalledPackagesViewModel InstalledPackagesViewModel { get; private set; }
-		public RecentPackagesViewModel RecentPackagesViewModel { get; private set; }
-		public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; private set; }
+		public AvailablePackagesViewModel AvailablePackagesViewModel { get; protected set; }
+		public InstalledPackagesViewModel InstalledPackagesViewModel { get; protected set; }
+		public RecentPackagesViewModel RecentPackagesViewModel { get; protected set; }
+		public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; protected set; }
 		
 		public void ReadPackages()
 		{
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs
@@ -66,7 +66,12 @@ void OnAddRecentPackage(object sender, EventArgs e)
 		
 		protected override IQueryable<IPackage> GetAllPackages()
 		{
-			return recentPackagesRepository.GetPackages().Where(package => project == null || package.HasProjectContent());
+			IQueryable<IPackage> allPackages;
+			allPackages = recentPackagesRepository.GetPackages();
+			if (project != null) {
+				allPackages = allPackages.Where(IsProjectPackage).AsQueryable();
+			}
+			return allPackages;
 		}
 	}
 }
diff --git a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
@@ -119,9 +119,12 @@
     <Compile Include="Src\Helpers\PropertiesHelper.cs" />
     <Compile Include="Src\Helpers\SelectedProjectCollectionAssert.cs" />
     <Compile Include="Src\Helpers\SolutionHelper.cs" />
+    <Compile Include="Src\Helpers\TestableAvailablepackagesViewModel.cs" />
     <Compile Include="Src\Helpers\TestableInstalledPackageViewModel.cs" />
     <Compile Include="Src\Helpers\TestablePackageFromRepository.cs" />
+    <Compile Include="Src\Helpers\TestablePackagesViewModels.cs" />
     <Compile Include="Src\Helpers\TestableProjectBehaviour.cs" />
+    <Compile Include="Src\Helpers\TestableRecentPackagesViewModel.cs" />
     <Compile Include="Src\Helpers\TestableSelectedProjectsForUpdatedPackages.cs" />
     <Compile Include="Src\Helpers\TestableSolutionSnapshot.cs" />
     <Compile Include="Src\Helpers\TestableUpdatePackagesAction.cs" />
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
@@ -30,7 +30,7 @@ namespace PackageManagement.Tests
 	[TestFixture]
 	public class AvailablePackagesViewModelTests
 	{
-		AvailablePackagesViewModel viewModel;
+		TestableAvailablePackagesViewModel viewModel;
 		PackageManagementEvents packageManagementEvents;
 		FakeRegisteredPackageRepositories registeredPackageRepositories;
 		ExceptionThrowingRegisteredPackageRepositories exceptionThrowingRegisteredPackageRepositories;
@@ -53,7 +53,8 @@ void CreateViewModel(FakeRegisteredPackageRepositories registeredPackageReposito
 			var packageViewModelFactory = new FakePackageViewModelFactory();
 			packageManagementEvents = new PackageManagementEvents();
 
-			viewModel = new AvailablePackagesViewModel(
+			viewModel = new TestableAvailablePackagesViewModel(
+				new FakePackageManagementSolution(),
 				packageManagementEvents,
 				registeredPackageRepositories, 
 				packageViewModelFactory, 
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableAvailablepackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableAvailablepackagesViewModel.cs
@@ -0,0 +1,55 @@
+﻿// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using ICSharpCode.PackageManagement;
+
+namespace PackageManagement.Tests.Helpers
+{
+	/// <summary>
+	/// Description of TestableAvailablepackagesViewModel.
+	/// </summary>
+	public class TestableAvailablePackagesViewModel : AvailablePackagesViewModel
+	{
+		public TestableAvailablePackagesViewModel(
+			IPackageManagementSolution solution,
+			IPackageManagementEvents packageManagementEvents,
+			IRegisteredPackageRepositories registeredPackageRepositories,
+			IPackageViewModelFactory packageViewModelFactory,
+			ITaskFactory taskFactory)
+			: base(
+				solution,
+				packageManagementEvents,
+				registeredPackageRepositories, 
+				packageViewModelFactory, 
+				taskFactory)
+		{
+			IsProjectPackageReturnsValue = true;
+			IsProjectPackageIsCalled = false;
+		}
+		
+		protected override bool IsProjectPackage(NuGet.IPackage package)
+		{
+			IsProjectPackageIsCalled = true;
+			return IsProjectPackageReturnsValue;
+		}
+		
+		public bool IsProjectPackageReturnsValue { get; set; }
+		public bool IsProjectPackageIsCalled { get; set; }
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs
@@ -64,8 +64,20 @@ public TestablePackageViewModel(
 			this.FakePackageManagementEvents = packageManagementEvents;
 			this.FakeActionRunner = actionRunner;
 			this.FakeLogger = logger;
+
+			IsProjectPackageReturnsValue = true;
+			IsProjectPackageIsCalled = false;
 		}
 		
+		protected override bool IsProjectPackage(NuGet.IPackage package)
+		{
+			IsProjectPackageIsCalled = true;
+			return IsProjectPackageReturnsValue;
+		}
+		
+		public bool IsProjectPackageReturnsValue { get; set; }
+		public bool IsProjectPackageIsCalled { get; set; }
+		
 		protected override PackageViewModelOperationLogger CreateLogger(ILogger logger)
 		{
 			PackageViewModelOperationLogger operationLogger = base.CreateLogger(logger);
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs
@@ -49,6 +49,8 @@ public TestablePackagesViewModel(
 			FakeRegisteredPackageRepositories registeredPackageRepositories,
 			FakeTaskFactory taskFactory)
 			: base(
+				new FakePackageManagementSolution(),
+				new FakePackageManagementEvents(),
 				registeredPackageRepositories,
 				new FakePackageViewModelFactory(),
 				taskFactory)
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModels.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModels.cs
@@ -0,0 +1,45 @@
+﻿// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using ICSharpCode.PackageManagement;
+
+namespace PackageManagement.Tests.Helpers
+{
+	/// <summary>
+	/// Description of TestablePackagesViewModels.
+	/// </summary>
+	public class TestablePackagesViewModels : PackagesViewModels
+	{
+		public TestablePackagesViewModels(
+			IPackageManagementSolution solution,
+			IRegisteredPackageRepositories registeredPackageRepositories,
+			IThreadSafePackageManagementEvents packageManagementEvents,
+			IPackageActionRunner actionRunner,
+			ITaskFactory taskFactory) : base()
+		{
+			var packageViewModelFactory = new PackageViewModelFactory(solution, packageManagementEvents, actionRunner);
+			var updatedPackageViewModelFactory = new UpdatedPackageViewModelFactory(packageViewModelFactory);
+			
+			AvailablePackagesViewModel = new TestableAvailablePackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
+			InstalledPackagesViewModel = new InstalledPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
+			UpdatedPackagesViewModel = new UpdatedPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, updatedPackageViewModelFactory, taskFactory);
+			RecentPackagesViewModel = new TestableRecentPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
+		}
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableRecentPackagesViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableRecentPackagesViewModel.cs
@@ -0,0 +1,55 @@
+﻿// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using ICSharpCode.PackageManagement;
+
+namespace PackageManagement.Tests.Helpers
+{
+	/// <summary>
+	/// Description of TestableRecentPackagesViewModel.
+	/// </summary>
+	public class TestableRecentPackagesViewModel : RecentPackagesViewModel
+	{
+		public TestableRecentPackagesViewModel(
+			IPackageManagementSolution solution,
+			IPackageManagementEvents packageManagementEvents,
+			IRegisteredPackageRepositories registeredPackageRepositories,
+			IPackageViewModelFactory packageViewModelFactory,
+			ITaskFactory taskFactory)
+			: base(
+				solution,
+				packageManagementEvents,
+				registeredPackageRepositories, 
+				packageViewModelFactory, 
+				taskFactory)
+		{
+			IsProjectPackageReturnsValue = true;
+			IsProjectPackageIsCalled = false;
+		}
+
+		protected override bool IsProjectPackage(NuGet.IPackage package)
+		{
+			IsProjectPackageIsCalled = true;
+			return IsProjectPackageReturnsValue;
+		}
+		
+		public bool IsProjectPackageReturnsValue { get; set; }
+		public bool IsProjectPackageIsCalled { get; set; }
+	}
+}
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableUpdatedPackageViewModel.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableUpdatedPackageViewModel.cs
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs
diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,10 @@ protected override IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(`
`108`	`108`	`.DistinctLast<IPackage>(PackageEqualityComparer.Id);`
`109`	`109`	`}`
`110`	`110`	`if (project != null) {`
`111`		`- filteredPackages = filteredPackages.Where(package => package.HasProjectContent());`
	`111`	`+ filteredPackages = filteredPackages.Where(IsProjectPackage);`
`112`	`112`	`}`
`113`	`113`	`return filteredPackages;`
`114`	`114`	`}`
	`115`	`+`
`115`	`116`	`}`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ public static FakePackage CreatePackageWithVersion(string id, string version)`
`66`	`66`	`return new FakePackage(id, version);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public bool IsProjectPackage { get { return true; } }`
`70`		`-`
`71`	`69`	`public string Id { get; set; }`
`72`	`70`	`public SemanticVersion Version { get; set; }`
`73`	`71`	`public string Title { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,10 @@ public static string GetName(this IPackage package)`
`42`	`42`	`return package.Id;`
`43`	`43`	`return package.Title;`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ public static bool IsProjectPackage(this IPackage package)`
	`47`	`+ {`
	`48`	`+ return package.HasProjectContent();`
	`49`	`+ }`
`45`	`50`	`}`
`46`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,5 @@ public interface IPackageFromRepository : IPackage`
`27`	`27`	`bool HasDependencies { get; }`
`28`	`28`	`DateTime? LastUpdated { get; }`
`29`	`29`	`Uri GalleryUrl { get; }`
`30`		`- bool IsProjectPackage { get; }`
`31`	`30`	`}`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public PackageFromRepository(IPackage package, IPackageRepository repository)`
`36`	`36`	`this.Repository = repository;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public bool IsProjectPackage { get { return this.HasProjectContent(); } }`
`40`		`-`
`41`	`39`	`public IPackageRepository Repository { get; private set; }`
`42`	`40`
`43`	`41`	`public IEnumerable<IPackageAssemblyReference> AssemblyReferences {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ namespace ICSharpCode.PackageManagement`
`22`	`22`	`{`
`23`	`23`	`public class PackagesViewModels : IDisposable`
`24`	`24`	`{`
	`25`	`+ protected PackagesViewModels() {}`
	`26`	`+`
`25`	`27`	`public PackagesViewModels(`
`26`	`28`	`IPackageManagementSolution solution,`
`27`	`29`	`IRegisteredPackageRepositories registeredPackageRepositories,`
`@@ -38,10 +40,10 @@ public PackagesViewModels(`
`38`	`40`	`RecentPackagesViewModel = new RecentPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);`
`39`	`41`	`}`
`40`	`42`
`41`		`- public AvailablePackagesViewModel AvailablePackagesViewModel { get; private set; }`
`42`		`- public InstalledPackagesViewModel InstalledPackagesViewModel { get; private set; }`
`43`		`- public RecentPackagesViewModel RecentPackagesViewModel { get; private set; }`
`44`		`- public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; private set; }`
	`43`	`+ public AvailablePackagesViewModel AvailablePackagesViewModel { get; protected set; }`
	`44`	`+ public InstalledPackagesViewModel InstalledPackagesViewModel { get; protected set; }`
	`45`	`+ public RecentPackagesViewModel RecentPackagesViewModel { get; protected set; }`
	`46`	`+ public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; protected set; }`
`45`	`47`
`46`	`48`	`public void ReadPackages()`
`47`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,12 @@ void OnAddRecentPackage(object sender, EventArgs e)`
`66`	`66`
`67`	`67`	`protected override IQueryable<IPackage> GetAllPackages()`
`68`	`68`	`{`
`69`		`- return recentPackagesRepository.GetPackages().Where(package => project == null \|\| package.HasProjectContent());`
	`69`	`+ IQueryable<IPackage> allPackages;`
	`70`	`+ allPackages = recentPackagesRepository.GetPackages();`
	`71`	`+ if (project != null) {`
	`72`	`+ allPackages = allPackages.Where(IsProjectPackage).AsQueryable();`
	`73`	`+ }`
	`74`	`+ return allPackages;`
`70`	`75`	`}`
`71`	`76`	`}`
`72`	`77`	`}`