diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs index fd1af97627..7c9717c623 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs @@ -24,16 +24,21 @@ namespace ICSharpCode.Reports.Addin.Commands public override void Run() { - WorkbenchSingleton.Workbench.ShowView(SetupDesigner()); + throw new NotImplementedException("StartViewCommand-Run"); +// SD.Workbench.ShowView(SetupDesigner()); } + /* public static ReportDesignerView SetupDesigner () { - + throw new NotImplementedException("SetupDesigner"); ReportModel model = ReportModel.Create(); - Properties customizer = new Properties(); - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePlainReport(model); + + 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]); @@ -41,7 +46,7 @@ namespace ICSharpCode.Reports.Addin.Commands // return SetupDesigner(file); return SetupDesigner(null); } - + */ public static ReportDesignerView SetupDesigner (OpenedFile file) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs index 0226794cda..ad7802e22c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/AbstractReportGenerator.cs @@ -24,34 +24,29 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public interface IReportGenerator{ void GenerateReport (); XmlDocument XmlReport {get;} - MemoryStream Generated { - get; - } - Properties Properties{ - get; - } + MemoryStream Generated {get;} + ReportStructure ReportStructure {get;} } + public abstract class AbstractReportGenerator : IReportGenerator { private StringWriter stringWriter; - private ReportItemCollection reportItemCollection; private AvailableFieldsCollection availableFieldsCollection; private ParameterCollection parameterCollection; - - private ColumnCollection groupColumnCollection; - protected AbstractReportGenerator(ReportModel reportModel) + protected AbstractReportGenerator(ReportModel reportModel,ReportStructure reportStructure) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - + if (reportStructure == null) { + throw new ArgumentNullException("reportStructure"); + } this.ReportModel = reportModel; -// this.Properties = properties; - + ReportStructure = reportStructure; this.AvailableFieldsCollection.Clear(); this.ReportItemCollection.Clear(); this.GroupColumnCollection.Clear(); @@ -153,14 +148,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion - protected ReportStructure ReportStructure {get;private set;} + public ReportStructure ReportStructure {get;private set;} public ReportModel ReportModel {get;private set;} - - public Properties Properties {get; private set;} - - + protected ReportItemCollection ReportItemCollection { get { if (this.reportItemCollection == null) { this.reportItemCollection = new ReportItemCollection(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs index 8ee8d63674..5e1be6b3dc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GenerateFormSheetReport.cs @@ -15,8 +15,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard /// public class GenerateFormSheetReport:GeneratePlainReport { - public GenerateFormSheetReport(ReportModel reportModel ):base(reportModel) - + public GenerateFormSheetReport(ReportModel reportModel,ReportStructure reportStructure ):base(reportModel,reportStructure) { if (reportModel == null) { @@ -34,7 +33,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard ListLayout layout = new ListLayout(base.ReportModel,null); layout.CreateReportHeader(); layout.CreatePageFooter(); -// base.AdjustAllNames(); base.WriteToXml(); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs index ac8112aa04..95dd6f8885 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePlainReport.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public class GeneratePlainReport:AbstractReportGenerator { - public GeneratePlainReport(ReportModel reportModel):base(reportModel) + public GeneratePlainReport(ReportModel reportModel,ReportStructure reportStructure):base(reportModel,reportStructure) {} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs index ffb4920f59..6b55be9386 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePullDataReport.cs @@ -15,13 +15,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard internal class GeneratePullDataReport: AbstractReportGenerator { - - public GeneratePullDataReport(ReportModel reportModel):base(reportModel) + public GeneratePullDataReport(ReportModel reportModel,ReportStructure reportStructure):base(reportModel,reportStructure) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - base.UpdateGenerator(); base.UpdateModel(); base.SqlQueryParameters.AddRange(base.ReportStructure.SqlQueryParameters); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs index 8c01b81c47..51da81c44f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratePushDataReport.cs @@ -24,7 +24,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard /// /// Default constructor - initializes all fields to default values /// - public GeneratePushDataReport(ReportModel reportModel):base(reportModel){ + public GeneratePushDataReport(ReportModel reportModel,ReportStructure reportStructure):base(reportModel,reportStructure){ base.UpdateGenerator(); base.UpdateModel(); } @@ -35,14 +35,14 @@ namespace ICSharpCode.Reports.Addin.ReportWizard base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportType.DataReport; base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModel.PushData; base.GenerateReport(); -// GlobalEnums.ReportLayout reportLayout = (GlobalEnums.ReportLayout)base.Properties.Get("ReportLayout"); + + GlobalEnums.ReportLayout reportLayout = ReportStructure.ReportLayout; + var layout = LayoutFactory.CreateGenerator(reportLayout,base.ReportModel,base.ReportItemCollection); -// AbstractLayout layout = LayoutFactory.CreateGenerator(reportLayout,base.ReportModel,base.ReportItemCollection); -// -// layout.CreateReportHeader(); -// layout.CreatePageHeader(); -// layout.CreateDataSection(base.ReportModel.DetailSection); -// layout.CreatePageFooter(); + layout.CreateReportHeader(); + layout.CreatePageHeader(); + layout.CreateDataSection(base.ReportModel.DetailSection); + layout.CreatePageFooter(); base.WriteToXml(); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs index 76568785a3..7787a2aa64 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/GeneratorFactory.cs @@ -35,20 +35,19 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public static class GeneratorFactory { - public static IReportGenerator Create (ReportModel model, - Properties customizer) + public static IReportGenerator Create (ReportModel model,ReportStructure reportStructure) + { IReportGenerator reportGenerator = null; switch (model.DataModel) { case GlobalEnums.PushPullModel.PullData: - reportGenerator = new GeneratePullDataReport(model); - + reportGenerator = new GeneratePullDataReport(model,reportStructure); break; case GlobalEnums.PushPullModel.PushData: - reportGenerator = new GeneratePushDataReport(model); + reportGenerator = new GeneratePushDataReport(model,reportStructure); break; case GlobalEnums.PushPullModel.FormSheet: - reportGenerator = new GenerateFormSheetReport (model); + reportGenerator = new GenerateFormSheetReport (model,reportStructure); break; } return reportGenerator; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs index c7484a215d..c2d5b17293 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/AbstractLayout.cs @@ -138,7 +138,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion - protected ReportItemCollection AddItemsToContainer () + protected ReportItemCollection CreateItemsCollection () { int locationX = GlobalValues.ControlMargins.Left; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs index 1c1d2e1b88..274cb0b3ef 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportLayout/ListLayout.cs @@ -77,7 +77,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard Size CreateDetail() { - var items = base.AddItemsToContainer(); + var items = base.CreateItemsCollection(); Container.Items.AddRange(items); return items[0].Size; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs index 90256bff66..ce08a4ecb3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportStructure.cs @@ -66,7 +66,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard if (!String.IsNullOrEmpty(this.Grouping)) { string s = "=[" + this.Grouping + "]"; - //GroupColumn g = new GroupColumn(this.Grouping,1,System.ComponentModel.ListSortDirection.Ascending); GroupColumn g = new GroupColumn(s,1,System.ComponentModel.ListSortDirection.Ascending); settings.GroupColumnsCollection.Add(g); } @@ -138,12 +137,15 @@ namespace ICSharpCode.Reports.Addin.ReportWizard #endregion + public GlobalEnums.ReportLayout ReportLayout {get;set;} + #region Grouping public string Grouping {get;set;} #endregion + #region IDisposable public void Dispose(){ this.Dispose(true); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs index 9f64199178..ebf47a6be6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/ReportWizardCommand.cs @@ -23,7 +23,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard private OpenedFile file; private ReportModel reportModel; private IReportGenerator reportGenerator; - private Properties customizer = new Properties(); +// private Properties customizer = new Properties(); private ReportStructure reportStructure; private bool canceled; @@ -37,15 +37,12 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public override void Run() { reportStructure = new ReportStructure(); -// customizer.Set("Generator", reportStructure); -// customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - if (GlobalValues.IsValidPrinter() == true) { using (WizardDialog wizard = new WizardDialog("Report Wizard", reportStructure, WizardPath)) { if (wizard.ShowDialog() == DialogResult.OK) { reportModel = reportStructure.CreateAndFillReportModel (); - CreateReportFromModel(reportModel); + CreateReportFromModel(reportModel,reportStructure); } else{ this.canceled = true; @@ -57,9 +54,9 @@ namespace ICSharpCode.Reports.Addin.ReportWizard } - private void CreateReportFromModel (ReportModel model) + private void CreateReportFromModel (ReportModel model,ReportStructure reportStructure) { - reportGenerator = GeneratorFactory.Create (model,customizer); + reportGenerator = GeneratorFactory.Create (model,reportStructure); file.MakeDirty(); reportGenerator.GenerateReport(); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs index 8bf4e080be..92d2a39f29 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/BaseSettingsPanel.cs @@ -42,10 +42,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{ private RadioButton radioStandardLayout; private RadioButton radioLandscape; - ReportStructure generator; -// Properties customizer; -//ReportStructure ReportStructure customizer; - + ReportStructure reportStructure; bool initDone; public BaseSettingsPanel(){ @@ -158,37 +155,35 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{ private void UpdateGenerator () { -// if (customizer == null) { -// customizer = (ReportStructure)base.CustomizationObject; -// generator = (ReportStructure)customizer.Get("Generator"); - generator = (ReportStructure)base.CustomizationObject; -// } - generator.ReportName = txtReportName.Text; + reportStructure = (ReportStructure)base.CustomizationObject; + + + reportStructure.ReportName = txtReportName.Text; if (!this.txtFileName.Text.EndsWith(GlobalValues.ReportExtension,StringComparison.OrdinalIgnoreCase)){ - generator.FileName = txtFileName.Text + GlobalValues.ReportExtension; + reportStructure.FileName = txtFileName.Text + GlobalValues.ReportExtension; } else { - generator.FileName = txtFileName.Text; + reportStructure.FileName = txtFileName.Text; } - generator.Path = this.txtPath.Text; - generator.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit), + reportStructure.Path = this.txtPath.Text; + reportStructure.GraphicsUnit = (GraphicsUnit)Enum.Parse(typeof(GraphicsUnit), this.cboGraphicsUnit.Text); if (this.radioPullModell.Checked == true) { base.NextWizardPanelID = "PullModel"; - generator.DataModel = GlobalEnums.PushPullModel.PullData; + reportStructure.DataModel = GlobalEnums.PushPullModel.PullData; GoOn(); } else if (this.radioPushModell.Checked == true){ base.NextWizardPanelID = "PushModel"; - generator.DataModel = GlobalEnums.PushPullModel.PushData; + reportStructure.DataModel = GlobalEnums.PushPullModel.PushData; GoOn(); } else if (this.radioFormSheet.Checked == true){ - generator.DataModel = GlobalEnums.PushPullModel.FormSheet; + reportStructure.DataModel = GlobalEnums.PushPullModel.FormSheet; base.EnableNext = false; base.IsLastPanel = true; } - generator.Landscape = this.radioLandscape.Checked; + reportStructure.Landscape = this.radioLandscape.Checked; } @@ -198,11 +193,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{ if (this.radioPullModell.Checked == true) { base.NextWizardPanelID = "PullModel"; - generator.DataModel = GlobalEnums.PushPullModel.PullData; + reportStructure.DataModel = GlobalEnums.PushPullModel.PullData; GoOn(); } else if (this.radioPushModell.Checked == true){ base.NextWizardPanelID = "PushModel"; - generator.DataModel = GlobalEnums.PushPullModel.PushData; + reportStructure.DataModel = GlobalEnums.PushPullModel.PushData; GoOn(); } else if (this.radioFormSheet.Checked == true){ // generator.DataModel = GlobalEnums.PushPullModel.FormSheet; @@ -210,10 +205,10 @@ namespace ICSharpCode.Reports.Addin.ReportWizard{ base.IsLastPanel = true; } else if(this.radioStandardLayout.Checked == true) { - generator.Landscape = false; + reportStructure.Landscape = false; } else if(this.radioLandscape.Checked == true) { - generator.Landscape = true; + reportStructure.Landscape = true; } base.EnableFinish = true; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs index 1a09758f70..d3881d7c2c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/LayoutPanel.cs @@ -3,9 +3,6 @@ using System; using System.Drawing; -using ICSharpCode.Core; -using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.Globals; namespace ICSharpCode.Reports.Addin.ReportWizard { @@ -15,7 +12,6 @@ namespace ICSharpCode.Reports.Addin.ReportWizard public class LayoutPanel: AbstractWizardPanel { private LayoutPanelControl layoutControl; -// private Properties customizer; private ReportStructure reportStructure; public LayoutPanel() @@ -43,6 +39,7 @@ namespace ICSharpCode.Reports.Addin.ReportWizard else if (message == DialogMessage.Finish) { + reportStructure.ReportLayout = layoutControl.ReportLayout; reportStructure.Grouping = layoutControl.GroupName; } return true; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs index a45f1a923e..2d7d8094d6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/ReportDesignerDisplayBindingTestFixture.cs @@ -13,7 +13,9 @@ using NUnit.Framework; namespace ICSharpCode.Reports.Addin.Test.Designer { + [TestFixture] + public class ReportDesignerDisplayBindingTestFixture { ReportDesignerDisplayBinding displayBinding; @@ -49,15 +51,17 @@ namespace ICSharpCode.Reports.Addin.Test.Designer Assert.IsTrue(displayBinding.IsPreferredBindingForFile(filename)); } - /* + [Test] [Ignore] public void CanCreateContentFromFile () { ReportModel model = ReportModel.Create(); - Properties customizer = new Properties(); - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePlainReport(model); + 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); @@ -66,7 +70,5 @@ namespace ICSharpCode.Reports.Addin.Test.Designer //ICSharpCode.SharpDevelop.Gui.IViewContent v = displayBinding.CreateContentForFile(new MockOpenedFile("test.srd")); //Assert.IsNotNull(v,"View should not be 'null'"); } - */ - } } \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/ICSharpCode.Reports.Addin.Test.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/ICSharpCode.Reports.Addin.Test.csproj index db640d4f31..5648ad0ad2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/ICSharpCode.Reports.Addin.Test.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/ICSharpCode.Reports.Addin.Test.csproj @@ -67,7 +67,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs index 747a290df4..a72950f146 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/GeneratePlainReportFixture_1.cs @@ -18,16 +18,18 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Ignore] public class GeneratePlainReportFixture { - /* + [Test] public void GeneratePlainReport_1() { ReportModel model = ReportModel.Create(); - Properties customizer = new Properties(); - - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePlainReport(model); + + ReportStructure reportStructure = new ReportStructure() + { + ReportLayout = GlobalEnums.ReportLayout.ListLayout + }; + IReportGenerator generator = new GeneratePlainReport(model,reportStructure); generator.GenerateReport(); XDocument doc1 = XDocument.Load(new XmlNodeReader (generator.XmlReport)); @@ -47,11 +49,10 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard foreach (XElement a in sq) { Console.WriteLine (a.Name); - } + } } - [Test] public void CheckReportSettings () { @@ -85,18 +86,19 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard } Assert.AreEqual (5,sq1.Count(),"Should be 5 times a 'BaseSection'"); } - */ - /* + private XmlDocument CreateXmlFromModel () { ReportModel model = ReportModel.Create(); - Properties customizer = new Properties(); - - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePlainReport(model); + ReportStructure reportStructure = new ReportStructure() + { + ReportLayout = GlobalEnums.ReportLayout.ListLayout + }; + IReportGenerator generator = new GeneratePlainReport(model,reportStructure); generator.GenerateReport(); return generator.XmlReport; } - */ + } + } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs index ca6cbce072..a08d6ed189 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs @@ -11,9 +11,10 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators { /* [TestFixture] - [Ignore] + public class GenerateListReportFixture { + private const string reportName = "ListBasedReport"; ReportModel reportModel; @@ -57,7 +58,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators #region Sort_Group [Test] - public void GroupColumCollection_Grouping_Should_Set() + public void CanAddGroupColumn() { ReportModel m = ReportGenerationHelper.CreateModel(reportName,false); var rs = m.ReportSettings; @@ -70,7 +71,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators [Test] - public void SortColumCollection_Sorting_Should_Set() + public void CanAddSortColumn() { ReportModel m = ReportGenerationHelper.CreateModel(reportName,false); var rs = m.ReportSettings; @@ -132,7 +133,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators [Test] - public void Row_Should_Contain_Dataitems() + public void Row_Should_Contain_Items() { ICSharpCode.Reports.Core.BaseSection s = this.reportModel.DetailSection; ICSharpCode.Reports.Core.BaseRowItem dataRow = (ICSharpCode.Reports.Core.BaseRowItem)s.Items[0]; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs index d593ff4eb1..328c2d76ec 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateFormsSheetReport.cs @@ -2,7 +2,6 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using ICSharpCode.Core; using ICSharpCode.Reports.Addin.ReportWizard; using ICSharpCode.Reports.Core; using ICSharpCode.Reports.Core.Globals; @@ -15,22 +14,22 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard public class GenerateFormsSheetReportFixture { - ReportModel model ; + ReportModel createdReportModel ; [Test] public void ModelContainFiveSections () { - Assert.AreEqual(5,this.model.SectionCollection.Count); + Assert.AreEqual(5,this.createdReportModel.SectionCollection.Count); } [Test] public void PageHeaderShouldContainOneItem () { - ICSharpCode.Reports.Core.BaseSection s = this.model.ReportHeader; - ReportItemCollection c = s.Items; - Assert.AreEqual(1,s.Items.Count); - ICSharpCode.Reports.Core.BaseReportItem item = s.Items[0]; + ICSharpCode.Reports.Core.BaseSection section = this.createdReportModel.ReportHeader; + ReportItemCollection c = section.Items; + Assert.AreEqual(1,section.Items.Count); + ICSharpCode.Reports.Core.BaseReportItem item = section.Items[0]; Assert.IsNotNull(item); } @@ -38,17 +37,17 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Test] public void DetailShouldContainNoItem () { - ICSharpCode.Reports.Core.BaseSection s = this.model.DetailSection; - Assert.AreEqual(0,s.Items.Count); + ICSharpCode.Reports.Core.BaseSection section = this.createdReportModel.DetailSection; + Assert.AreEqual(0,section.Items.Count); } [Test] public void PageFooterShouldContainOneItem () { - ICSharpCode.Reports.Core.BaseSection s = this.model.PageFooter; - Assert.AreEqual(1,s.Items.Count); - ICSharpCode.Reports.Core.BaseTextItem item = (ICSharpCode.Reports.Core.BaseTextItem)s.Items[0]; + ICSharpCode.Reports.Core.BaseSection section = this.createdReportModel.PageFooter; + Assert.AreEqual(1,section.Items.Count); + ICSharpCode.Reports.Core.BaseTextItem item = (ICSharpCode.Reports.Core.BaseTextItem)section.Items[0]; Assert.IsNotNull(item); } @@ -56,8 +55,8 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Test] public void PageFooterContainsPageNumberFunction() { - ICSharpCode.Reports.Core.BaseSection s = this.model.PageFooter; - ICSharpCode.Reports.Core.BaseTextItem item = (ICSharpCode.Reports.Core.BaseTextItem)s.Items[0]; + ICSharpCode.Reports.Core.BaseSection section = this.createdReportModel.PageFooter; + ICSharpCode.Reports.Core.BaseTextItem item = (ICSharpCode.Reports.Core.BaseTextItem)section.Items[0]; Assert.AreEqual("=Globals!PageNumber",item.Text); Assert.AreEqual("PageNumber1",item.Name); } @@ -67,21 +66,22 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard private ReportModel CreateModel () { ReportModel m = ReportModel.Create(); - Properties customizer = new Properties(); + + ReportStructure reportStructure = new ReportStructure() + { + ReportLayout = GlobalEnums.ReportLayout.ListLayout + }; - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GenerateFormSheetReport(m); + IReportGenerator generator = new GenerateFormSheetReport(m,reportStructure); generator.GenerateReport(); - ReportLoader rl = new ReportLoader(); - object root = rl.Load(generator.XmlReport.DocumentElement); + ReportLoader loader = new ReportLoader(); + object root = loader.Load(generator.XmlReport.DocumentElement); + ReportModel model = root as ReportModel; - if (model != null) { - model.ReportSettings.FileName = GlobalValues.PlainFileName; - FilePathConverter.AdjustReportName(model); - } else { - throw new InvalidReportModelException(); - } + + model.ReportSettings.FileName = GlobalValues.PlainFileName; + FilePathConverter.AdjustReportName(model); return model; } @@ -89,8 +89,9 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [TestFixtureSetUp] public void Init() { - this.model = this.CreateModel(); + this.createdReportModel = this.CreateModel(); } + } */ } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs index d257c0e2cc..368366b3fd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateListWithGroupFixture.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators /// Description of GenerateListWithGroupFixture. /// [TestFixture] - [Ignore] +// [Ignore] public class GenerateListWithGroupFixture { @@ -94,6 +94,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators #endregion + } } -*/ \ No newline at end of file +*/ diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs index 9bf629c787..24f55d3974 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs @@ -16,6 +16,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators [Ignore] public class GenerateTableReportFixture { + /* private const string reportName = "TableBasedReport"; ReportModel reportModel; @@ -135,7 +136,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators } #endregion - + */ } */ } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs index 55d6961a4b..e376bb0742 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableWithGrouping.cs @@ -21,9 +21,9 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators /* [TestFixture] [Ignore] - public class GenertaeTableWithGroupFixture + public class GenerateTableWithGroupFixture { - + /* private const string reportName = "TableBasedReport"; private ReportModel reportModel; @@ -136,7 +136,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators } #endregion - + */ } */ } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs index 576f65b312..b330518bf1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Wizard/Generators/ReportGenerationHelper.cs @@ -45,26 +45,23 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard public static ReportModel CreateModel (string reportName,bool createGrouping) { - ReportStructure structure = CreateReportStructure(reportName); + ReportStructure reportStructure = CreateReportStructure(reportName); AvailableFieldsCollection abstractColumns = new AvailableFieldsCollection(); AbstractColumn a1 = new AbstractColumn("Field1",typeof(System.String)); - structure.AvailableFieldsCollection.Add(a1); + reportStructure.AvailableFieldsCollection.Add(a1); ICSharpCode.Reports.Core.BaseDataItem bri = new ICSharpCode.Reports.Core.BaseDataItem(); bri.Name ="Field1"; - structure.ReportItemCollection.Add(bri); + reportStructure.ReportItemCollection.Add(bri); if (createGrouping) { - structure.Grouping = "group"; + reportStructure.Grouping = "group"; } - ReportModel m = structure.CreateAndFillReportModel(); - ICSharpCode.Core.Properties customizer = new ICSharpCode.Core.Properties(); + ReportModel m = reportStructure.CreateAndFillReportModel(); - customizer.Set("Generator", structure); - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePushDataReport(m); + IReportGenerator generator = new GeneratePushDataReport(m,reportStructure); generator.GenerateReport(); ReportLoader rl = new ReportLoader();