PackageManagement: Make Tests Testable

1) Enable testable derivations for previous commit changes
2) Tests: Make new and extend existing testable classes/derivations

src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs

@@ -108,9 +108,10 @@ namespace ICSharpCode.PackageManagement
 					.DistinctLast<IPackage>(PackageEqualityComparer.Id);
 			}
 			if (project != null) {
-				filteredPackages = filteredPackages.Where(package => package.HasProjectContent());
+				filteredPackages = filteredPackages.Where(IsProjectPackage);
 			}
 			return filteredPackages;
 		}
+
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs

@@ -66,8 +66,6 @@ namespace ICSharpCode.PackageManagement.Design
 			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; }

src/AddIns/Misc/PackageManagement/Project/Src/IPackageExtensions.cs

@@ -42,5 +42,10 @@ namespace ICSharpCode.PackageManagement
 				return package.Id;
 			return package.Title;
 		}
+
+		public static bool IsProjectPackage(this IPackage package)
+		{
+			return package.HasProjectContent();
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/IPackageFromRepository.cs

@@ -27,6 +27,5 @@ namespace ICSharpCode.PackageManagement
 		bool HasDependencies { get; }
 		DateTime? LastUpdated { get; }
 		Uri GalleryUrl { get; }
-		bool IsProjectPackage { get; }
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs

@@ -36,8 +36,6 @@ namespace ICSharpCode.PackageManagement
 			this.Repository = repository;
 		}
 
-		public bool IsProjectPackage { get { return this.HasProjectContent(); } }
-
 		public IPackageRepository Repository { get; private set; }
 		
 		public IEnumerable<IPackageAssemblyReference> AssemblyReferences {

src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs

@@ -119,7 +119,7 @@ namespace ICSharpCode.PackageManagement
 			get {
 				if (selectedProjects.HasSingleProjectSelected()) {
 					return selectedProjects.GetSingleProjectSelected(package.Repository).IsPackageInstalled(package)
-						|| (IsPackageInstalled() && !package.IsProjectPackage);
+						|| (IsPackageInstalled() && !IsProjectPackage(package));
 				}
 				return IsPackageInstalled();
 			}
@@ -198,6 +198,15 @@ namespace ICSharpCode.PackageManagement
 			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);
@@ -205,7 +214,7 @@ namespace ICSharpCode.PackageManagement
 
 		public void AddOrManagePackage() {
 			if (selectedProjects.HasMultipleProjects()) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					ManagePackage();
 				}
 				else {
@@ -223,7 +232,7 @@ namespace ICSharpCode.PackageManagement
 			logger.LogAddingPackage();
 			
 			using (IDisposable operation = StartOperation(package)) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					TryInstallingPackage();
 				}
 				else {
@@ -367,7 +376,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public void RemoveOrManagePackage() {
 			if (selectedProjects.HasMultipleProjects()) {
-				if (package.IsProjectPackage) {
+				if (IsProjectPackage(package)) {
 					ManagePackage();
 				}
 				else {
@@ -384,7 +393,7 @@ namespace ICSharpCode.PackageManagement
 			ClearReportedMessages();
 			logger.LogRemovingPackage();
 
-			if (package.IsProjectPackage) {
+			if (IsProjectPackage(package)) {
 				TryUninstallingPackage();
 			} else {
 				TryUninstallingSolutionPackage();
@@ -434,7 +443,7 @@ namespace ICSharpCode.PackageManagement
 				// Solution selected 
 				// Project-level/Solution-level Package Management
 				if (IsAdded) {
-					if (package.IsProjectPackage) {
+					if (IsProjectPackage(package)) {
 						return true; // [Manage] Button
 					}
 					return false; // [Remove] Button

src/AddIns/Misc/PackageManagement/Project/Src/PackagesViewModel.cs

@@ -266,6 +266,15 @@ namespace ICSharpCode.PackageManagement
 			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.

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 @@ namespace ICSharpCode.PackageManagement
 			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()
 		{

src/AddIns/Misc/PackageManagement/Project/Src/RecentPackagesViewModel.cs

@@ -66,7 +66,12 @@ namespace ICSharpCode.PackageManagement
 		
 		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;
 		}
 	}
 }

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" />

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 @@ namespace PackageManagement.Tests
 			var packageViewModelFactory = new FakePackageViewModelFactory();
 			packageManagementEvents = new PackageManagementEvents();
 
-			viewModel = new AvailablePackagesViewModel(
+			viewModel = new TestableAvailablePackagesViewModel(
+				new FakePackageManagementSolution(),
 				packageManagementEvents,
 				registeredPackageRepositories, 
 				packageViewModelFactory, 

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; }
+	}
+}

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs

@@ -64,8 +64,20 @@ namespace PackageManagement.Tests.Helpers
 			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);

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackagesViewModel.cs

@@ -49,6 +49,8 @@ namespace PackageManagement.Tests.Helpers
 			FakeRegisteredPackageRepositories registeredPackageRepositories,
 			FakeTaskFactory taskFactory)
 			: base(
+				new FakePackageManagementSolution(),
+				new FakePackageManagementEvents(),
 				registeredPackageRepositories,
 				new FakePackageViewModelFactory(),
 				taskFactory)

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);
+		}
+	}
+}

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; }
+	}
+}

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableUpdatedPackageViewModel.cs

@@ -66,6 +66,18 @@ namespace PackageManagement.Tests.Helpers
 			this.FakeActionRunner = actionRunner;
 			this.FakeLogger = logger;
 			this.FakePackageManagementEvents = packageManagementEvents;
+
+			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; }
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs

@@ -44,7 +44,7 @@ namespace PackageManagement.Tests
 		FakePackageManagementEvents fakeThreadSafeEvents;
 		List<IPackageManagementSelectedProject> projectsPassedToOnSelectProjects;
 		ManagePackagesUserPrompts userPrompts;
-		PackagesViewModels packagesViewModels;
+		TestablePackagesViewModels packagesViewModels;
 		ManagePackagesViewTitle viewTitle;
 		
 		void CreateSolution()
@@ -82,7 +82,7 @@ namespace PackageManagement.Tests
 				fakeFileConflictResolver);
 			fakeActionRunner = new FakePackageActionRunner();
 			
-			packagesViewModels = new PackagesViewModels(
+			packagesViewModels = new TestablePackagesViewModels(
 				solution,
 				fakeRegisteredPackageRepositories,
 				packageManagementEvents,

src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs

@@ -27,7 +27,7 @@ namespace PackageManagement.Tests
 	[TestFixture]
 	public class RecentPackagesViewModelTests
 	{
-		RecentPackagesViewModel viewModel;
+		TestableRecentPackagesViewModel viewModel;
 		PackageManagementEvents packageManagementEvents;
 		FakeRegisteredPackageRepositories registeredPackageRepositories;
 		FakeTaskFactory taskFactory;
@@ -38,7 +38,8 @@ namespace PackageManagement.Tests
 			taskFactory = new FakeTaskFactory();
 			var packageViewModelFactory = new FakePackageViewModelFactory();
 			packageManagementEvents = new PackageManagementEvents();
-			viewModel = new RecentPackagesViewModel(
+			viewModel = new TestableRecentPackagesViewModel(
+				new FakePackageManagementSolution(),
 				packageManagementEvents,
 				registeredPackageRepositories,
 				packageViewModelFactory,

src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs

@@ -89,6 +89,7 @@ namespace PackageManagement.Tests
 			
 			viewModel = new UpdatedPackagesViewModel(
 				solution,
+				packageManagementEvents,
 				registeredPackageRepositories,
 				updatedPackageViewModelFactory,
 				taskFactory);
@@ -117,6 +118,7 @@ namespace PackageManagement.Tests
 			updatedPackageViewModelFactory = new UpdatedPackageViewModelFactory(packageViewModelFactory);
 			viewModel = new UpdatedPackagesViewModel(
 				solution,
+				packageManagementEvents,
 				registeredPackageRepositories,
 				updatedPackageViewModelFactory,
 				taskFactory);