Adjust some Test's, fix ViewCommands.cs (hint from linquize)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs

@@ -6,12 +6,9 @@ using System.Globalization;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
-using ICSharpCode.Reports.Addin.ReportWizard;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.Dialogs;
 using ICSharpCode.Reports.Core.Globals;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.Reports.Addin.Commands
@@ -19,56 +16,34 @@ namespace ICSharpCode.Reports.Addin.Commands
 	/// <summary>
 	/// Description of StartView
 	/// </summary>
-	public class StartViewCommand : AbstractMenuCommand
+	public class CreateDesignViewCommand : AbstractMenuCommand
 	{
+		readonly OpenedFile openedFile;
 		
-		public override void Run()
+		public CreateDesignViewCommand (OpenedFile openedFile) {
-		{
+			if (openedFile == null)
-			throw new NotImplementedException("StartViewCommand-Run");
+				throw new ArgumentNullException("openedFile");
-//			SD.Workbench.ShowView(SetupDesigner());
+			this.openedFile = openedFile;
 		}
 		
-		/*
+		public override void Run(){
-		public static ReportDesignerView SetupDesigner ()
+			var generator = new ReportDesignerGenerator();
-		{
+			DesignerView =  new ReportDesignerView(openedFile, generator);
-			throw new NotImplementedException("SetupDesigner");
-			ReportModel model = ReportModel.Create();
-			
-			var reportStructure = new ReportStructure()
-			{
-				ReportLayout = GlobalEnums.ReportLayout.ListLayout;
-			}
-			IReportGenerator generator = new GeneratePlainReport(model,reportStructure);
-			generator.GenerateReport();
-			
-//			OpenedFile file = FileService.CreateUntitledOpenedFile(GlobalValues.PlainFileName,new byte[0]);
-//			file.SetData(generator.Generated.ToArray());
-//			return SetupDesigner(file);
-			return SetupDesigner(null);
-		}
-		*/
-		
-		public static ReportDesignerView SetupDesigner (OpenedFile file)
-		{
-			if (file == null) {
-				throw new ArgumentNullException("file");
-			}
-			IDesignerGenerator generator = new ReportDesignerGenerator();
-			return new ReportDesignerView(file, generator);
 		}
 		
+		public ReportDesignerView DesignerView {get; private set;}
 	}
 	
 	
 	
 	public class CollectParametersCommand :AbstractCommand
 	{
-		ReportSettings reportSettings;
+		readonly ReportSettings reportSettings;
 		
 		public CollectParametersCommand (ReportSettings reportSettings)
 		{
 			if (reportSettings == null) {
-				throw new ArgumentNullException("ReportSettings");
+				throw new ArgumentNullException("reportSettings");
 			}
 			this.reportSettings = reportSettings;
 		}
@@ -77,7 +52,7 @@ namespace ICSharpCode.Reports.Addin.Commands
 		public override void Run()
 		{
 			if (reportSettings.SqlParameters.Count > 0) {
-				using (ParameterDialog paramDialog = new ParameterDialog(reportSettings.SqlParameters))
+				using (var paramDialog = new ParameterDialog(reportSettings.SqlParameters))
 				{
 					paramDialog.ShowDialog();
 					if (paramDialog.DialogResult == System.Windows.Forms.DialogResult.OK) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerDisplayBinding.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using ICSharpCode.Reports.Addin.Commands;
 using ICSharpCode.Reports.Addin.ReportWizard;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
@@ -25,15 +26,16 @@ namespace ICSharpCode.Reports.Addin
 		public IViewContent CreateContentForFile(OpenedFile file)
 		{
 			if (file.IsDirty) {
-				ReportWizardCommand cmd = new ReportWizardCommand(file);
+				var cmd = new ReportWizardCommand(file);
 				cmd.Run();
 				if (cmd.Canceled) {
 					return null;
 				}
 				file.SetData(cmd.GeneratedReport.ToArray());
 			}
-			ReportDesignerView view = ICSharpCode.Reports.Addin.Commands.StartViewCommand.SetupDesigner(file);
+			var viewCmd = new CreateDesignViewCommand(file);
-			return view;
+			viewCmd.Run();
+			return viewCmd.DesignerView;
 		}
 
 		public bool IsPreferredBindingForFile(ICSharpCode.Core.FileName fileName)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs

@@ -8,8 +8,6 @@ using System.Windows.Forms;
 using ICSharpCode.Core;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.Globals;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Workbench;
 
 namespace ICSharpCode.Reports.Addin.ReportWizard
@@ -20,7 +18,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 	public class ReportWizardCommand : AbstractMenuCommand
 	{
 		private const string WizardPath = "/ReportGenerator/ReportGeneratorWizard";
-		private OpenedFile file;
+		private readonly OpenedFile file;
 		private ReportModel reportModel;
 		private IReportGenerator reportGenerator;
 //		private Properties customizer = new Properties();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockReportDesignerDisplayBinding.cs

@@ -1,19 +0,0 @@
-// 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 NUnit.Framework;
-
-namespace ICSharpCode.Reports.Addin.Test.Designer
-{
-	[TestFixture]
-	[Ignore]
-	public class MockReportDesignerDisplayBinding:ReportDesignerDisplayBinding
-	{
-		[Test]
-		public void TestMethod()
-		{
-			// TODO: Add your test.
-		}
-	}
-}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs

@@ -51,24 +51,5 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
 			Assert.IsTrue(displayBinding.IsPreferredBindingForFile(filename));
 		}
 		
-		
-		[Test]
-		[Ignore]
-		public void CanCreateContentFromFile ()
-		{
-			ReportModel model = ReportModel.Create();
-		ReportStructure reportStructure = new ReportStructure()
-			{
-				ReportLayout = GlobalEnums.ReportLayout.ListLayout
-			};
-			IReportGenerator generator = new GeneratePlainReport(model,reportStructure);
-			generator.GenerateReport();
-			MockOpenedFile mof = new MockOpenedFile(GlobalValues.PlainFileName);
-			OpenedFile file = new MockOpenedFile(GlobalValues.PlainFileName);
-			file.SetData(generator.Generated.ToArray());
-			
-			//ICSharpCode.SharpDevelop.Gui.IViewContent v = displayBinding.CreateContentForFile(new MockOpenedFile("test.srd"));
-			//Assert.IsNotNull(v,"View should not be 'null'");
-		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerLoaderTestFixture.cs

@@ -27,13 +27,7 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
 			Assert.IsInstanceOf<ReportDesignerView>(this.generator.ViewContent);
 		}
 		
-		[Test]
+	
-		[Ignore]
-		public void FixMoreTests()
-		{
-			Assert.IsNotNull(this.generator.ViewContent);
-			Assert.IsInstanceOf<ReportDesignerView>(this.generator.ViewContent);
-		}
 		[TestFixtureSetUp]
 		public void Init()
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/ICSharpCode.Reports.Addin.Test.csproj

@@ -57,7 +57,6 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Designer\MockDesignerGenerator.cs" />
     <Compile Include="Designer\MockOpenedFile.cs" />
-    <Compile Include="Designer\MockReportDesignerDisplayBinding.cs" />
     <Compile Include="Designer\MockViewContend.cs" />
     <Compile Include="Designer\ReportDesignerDisplayBindingTestFixture.cs" />
     <Compile Include="Designer\ReportDesignerLoaderTestFixture.cs" />