PackageManagementOutputMessagesView no longer needs to implement ILogger.

src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@@ -94,7 +94,6 @@
     <Compile Include="Src\Design\FakeInstallPackageTask.cs" />
     <Compile Include="Src\Design\FakePackage.cs" />
     <Compile Include="Src\Design\FakePackageAssemblyReference.cs" />
-    <Compile Include="Src\Design\FakePackageManagementOutputMessagesView.cs" />
     <Compile Include="Src\Design\FakePackageManagementProjectService.cs" />
     <Compile Include="Src\Design\FakePackageManagementService.cs" />
     <Compile Include="Src\Design\FakePackageManager.cs" />

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

@@ -44,8 +44,6 @@ namespace ICSharpCode.PackageManagement.Design
 			FakeActiveProjectManager.FakeLocalRepository.FakePackages.Add(package);
 		}
 		
-		public FakePackageManagementOutputMessagesView FakeOutputMessagesView = new FakePackageManagementOutputMessagesView();
-		
 		public FakeProjectManager FakeProjectManagerToReturnFromCreateProjectManager = new FakeProjectManager();
 		public IPackageRepository PackageRepositoryPassedToCreateProjectManager;
 		public MSBuildBasedProject ProjectPassedToCreateProjectManager;

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

@@ -6,7 +6,7 @@ using NuGet;
 
 namespace ICSharpCode.PackageManagement
 {
-	public interface IPackageManagementOutputMessagesView : ILogger
+	public interface IPackageManagementOutputMessagesView
 	{
 		void Clear();
 	}

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

@@ -48,11 +48,5 @@ namespace ICSharpCode.PackageManagement
 		{
 			messageViewCategory.Clear();
 		}
-		
-		public void Log(MessageLevel level, string message, params object[] args)
-		{
-			string formattedMessage = String.Format(message, args);
-			messageViewCategory.AppendLine(formattedMessage);
-		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@@ -72,7 +72,9 @@
     <Compile Include="Src\AddPackageReferenceCommandTests.cs" />
     <Compile Include="Src\Helpers\ExceptionThrowingRegisteredPackageRepositories.cs" />
     <Compile Include="Src\Helpers\FakeAddPackageReferenceView.cs" />
+    <Compile Include="Src\Helpers\FakeLogger.cs" />
     <Compile Include="Src\Helpers\FakePackageManagementEvents.cs" />
+    <Compile Include="Src\Helpers\FakePackageManagementOutputMessagesView.cs" />
     <Compile Include="Src\Helpers\FakePackageViewModelFactory.cs" />
     <Compile Include="Src\Helpers\TestableAddPackageReferenceCommand.cs" />
     <Compile Include="Src\PackageManagementEventsTests.cs" />

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

@@ -3,14 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using ICSharpCode.PackageManagement;
 using NuGet;
 
-namespace ICSharpCode.PackageManagement.Design
+namespace PackageManagement.Tests.Helpers
 {
-	public class FakePackageManagementOutputMessagesView : IPackageManagementOutputMessagesView
+	public class FakeLogger : ILogger
 	{
-		public bool IsClearCalled;
 		public List<string> FormattedMessagesLogged = new List<string>();
 		
 		public string FirstFormattedMessageLogged {
@@ -35,11 +33,6 @@ namespace ICSharpCode.PackageManagement.Design
 			get { return FormattedMessagesLogged[1]; }
 		}
 		
-		public void Clear()
-		{
-			IsClearCalled = true;
-		}
-		
 		public void Log(MessageLevel level, string message, params object[] args)
 		{
 			string formattedMessage = String.Format(message, args);

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

@@ -0,0 +1,20 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using ICSharpCode.PackageManagement;
+using NuGet;
+
+namespace PackageManagement.Tests.Helpers
+{
+	public class FakePackageManagementOutputMessagesView : IPackageManagementOutputMessagesView
+	{
+		public bool IsClearCalled;
+		
+		public void Clear()
+		{
+			IsClearCalled = true;
+		}
+	}
+}

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

@@ -13,6 +13,7 @@ namespace PackageManagement.Tests.Helpers
 		public FakeRegisteredPackageRepositories FakeRegisteredPackageRepositories = new FakeRegisteredPackageRepositories();
 		public FakePackageManagementService FakePackageManagementService = new FakePackageManagementService();
 		public FakePackageManagementEvents FakePackageManagementEvents = new FakePackageManagementEvents();
+		public FakeLogger FakeLogger = new FakeLogger();
 		
 		public PackageViewModel CreatePackageViewModel(IPackage package)
 		{
@@ -21,7 +22,7 @@ namespace PackageManagement.Tests.Helpers
 				FakeRegisteredPackageRepositories.FakeActiveRepository,
 				FakePackageManagementService,
 				FakePackageManagementEvents,
-				FakePackageManagementService.FakeOutputMessagesView);
+				FakeLogger);
 		}
 		
 		public IRegisteredPackageRepositories RegisteredPackageRepositories {

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

@@ -14,6 +14,7 @@ namespace PackageManagement.Tests.Helpers
 		public FakePackageManagementService	FakePackageManagementService;
 		public FakePackageManagementEvents FakePackageManagementEvents;
 		public FakePackage FakePackage;
+		public FakeLogger FakeLogger;
 		public string PackageViewModelAddingPackageMessageFormat = String.Empty;
 		public string PackageViewModelRemovingPackageMessageFormat = String.Empty;
 		
@@ -23,7 +24,7 @@ namespace PackageManagement.Tests.Helpers
 				new FakePackageRepository(),
 				packageManagementService,
 				new FakePackageManagementEvents(),
-				packageManagementService.FakeOutputMessagesView)
+				new FakeLogger())
 		{		
 		}
 		
@@ -32,7 +33,7 @@ namespace PackageManagement.Tests.Helpers
 			FakePackageRepository sourceRepository,
 			FakePackageManagementService packageManagementService,
 			FakePackageManagementEvents packageManagementEvents,
-			FakePackageManagementOutputMessagesView logger)
+			FakeLogger logger)
 			: base(
 				package,
 				sourceRepository,
@@ -44,6 +45,7 @@ namespace PackageManagement.Tests.Helpers
 			this.FakePackageManagementService = packageManagementService;
 			this.FakePackageManagementEvents = packageManagementEvents;
 			this.FakeSourcePackageRepository = sourceRepository;
+			this.FakeLogger = logger;
 		}
 		
 		protected override string AddingPackageMessageFormat {

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

@@ -15,7 +15,7 @@ namespace PackageManagement.Tests.Helpers
 		public Stream StreamPassedToPhysicalFileSystemAddFile;
 		public FakeFileService FakeFileService;
 		public FakePackageManagementProjectService FakeProjectService;
-		public FakePackageManagementOutputMessagesView FakeOutputMessagesView;
+		public FakeLogger FakeLogger;
 		public string FileNamePassedToLogDeletedFile;
 		public FileNameAndDirectory FileNameAndDirectoryPassedToLogDeletedFileFromDirectory;
 		public string DirectoryPassedToLogDeletedDirectory;
@@ -24,19 +24,24 @@ namespace PackageManagement.Tests.Helpers
 		public FileNameAndProjectName FileNameAndProjectNamePassedToLogAddedFileToProject;
 		
 		public TestableSharpDevelopProjectSystem(MSBuildBasedProject project)
-			: this(project, new FakeFileService(project), new FakePackageManagementProjectService())
+			: this(
+				project,
+				new FakeFileService(project),
+				new FakePackageManagementProjectService(),
+				new FakeLogger())
 		{
 		}
 		
 		TestableSharpDevelopProjectSystem(
 			MSBuildBasedProject project,
 			IPackageManagementFileService fileService,
-			IPackageManagementProjectService projectService)
+			IPackageManagementProjectService projectService,
+			FakeLogger logger)
 			: base(project, fileService, projectService)
 		{
 			FakeFileService = (FakeFileService)fileService;
 			FakeProjectService = (FakePackageManagementProjectService)projectService;
-			Logger = FakeOutputMessagesView;
+			Logger = logger;
 		}
 		
 		protected override void PhysicalFileSystemAddFile(string path, Stream stream)

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

@@ -15,6 +15,7 @@ namespace PackageManagement.Tests.Helpers
 		public FakePackageManagementService	FakePackageManagementService;
 		public FakePackageManagementEvents FakePackageManagementEvents;
 		public FakePackage FakePackage;
+		public FakeLogger FakeLogger;
 		public ILogger LoggerUsedWhenCreatingPackageResolver;
 		public string PackageViewModelAddingPackageMessageFormat = String.Empty;
 		public string PackageViewModelRemovingPackageMessageFormat = String.Empty;
@@ -29,7 +30,8 @@ namespace PackageManagement.Tests.Helpers
 				new FakePackage(),
 				new FakePackageRepository(),
 				packageManagementService,
-				new FakePackageManagementEvents())
+				new FakePackageManagementEvents(),
+				new FakeLogger())
 		{		
 		}
 		
@@ -37,17 +39,19 @@ namespace PackageManagement.Tests.Helpers
 			FakePackage package,
 			FakePackageRepository sourceRepository,
 			FakePackageManagementService packageManagementService,
-			FakePackageManagementEvents packageManagementEvents)
+			FakePackageManagementEvents packageManagementEvents,
+			FakeLogger logger)
 			: base(
 				package,
 				sourceRepository,
 				packageManagementService,
 				packageManagementEvents,
-				packageManagementService.FakeOutputMessagesView)
+				logger)
 		{
 			this.FakePackage = package;
 			this.FakePackageManagementService = packageManagementService;
 			this.FakeSourcePackageRepository = sourceRepository;
+			this.FakeLogger = logger;
 		}
 		
 		protected override string AddingPackageMessageFormat {

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

@@ -37,7 +37,7 @@ namespace PackageManagement.Tests
 		
 		void LogInfoMessage(string message)
 		{
-			view.Log(MessageLevel.Info, message);
+			packageManagementEvents.OnPackageOperationMessageLogged(MessageLevel.Info, message);
 		}
 		
 		[Test]
@@ -93,16 +93,6 @@ namespace PackageManagement.Tests
 			Assert.AreEqual(expectedCategryName, actualCategoryName);
 		}
 		
-		[Test]
-		public void Log_InfoMessageUsingFormatStringPassed_FullyFormattedStringAddedToMessageViewCategory()
-		{
-			CreateView();
-			
-			view.Log(MessageLevel.Info, "Test {0}", 1);
-			
-			Assert.AreEqual("Test 1", fakeMessageCategoryView.FirstLineAppended);
-		}
-		
 		[Test]
 		public void OnPackageOperationMessageLogged_InfoMessageUsingFormatStringPassed_FullyFormattedStringAddedToMessageViewCategory()
 		{

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

@@ -21,7 +21,7 @@ namespace PackageManagement.Tests
 		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
 		FakeInstallPackageAction fakeInstallPackageTask;
 		FakeUninstallPackageAction fakeUninstallPackageAction;
-		FakePackageManagementOutputMessagesView fakeLogger;
+		FakeLogger fakeLogger;
 		
 		void CreateViewModel()
 		{
@@ -42,7 +42,7 @@ namespace PackageManagement.Tests
 			this.packageManagementService = packageManagementService;
 			sourcePackageRepository = viewModel.FakeSourcePackageRepository;
 			packageManagementEvents = viewModel.FakePackageManagementEvents;
-			fakeLogger = packageManagementService.FakeOutputMessagesView;
+			fakeLogger = viewModel.FakeLogger;
 			fakeInstallPackageTask = packageManagementService.ActionToReturnFromCreateInstallPackageAction;
 			fakeUninstallPackageAction = packageManagementService.ActionToReturnFromCreateUninstallPackageAction;
 		}

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

@@ -16,13 +16,13 @@ namespace PackageManagement.Tests
 		TestableProcessPackageAction action;
 		FakePackageManagementService fakePackageManagementService;
 		FakePackageManager fakePackageManager;
-		FakePackageManagementOutputMessagesView fakeOutputMessagesView;
+		FakeLogger fakeLogger;
 		
 		void CreateAction()
 		{
 			action = new TestableProcessPackageAction();
 			fakePackageManagementService = action.FakePackageManagementService;
-			fakeOutputMessagesView = fakePackageManagementService.FakeOutputMessagesView;
+			fakeLogger = new FakeLogger();
 			fakePackageManager = fakePackageManagementService.FakePackageManagerToReturnFromCreatePackageManager;
 		}