diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs index 3ac5a3a646..80c05b4e60 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenarateListReportFixture.cs @@ -17,7 +17,6 @@ using NUnit.Framework; namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators { [TestFixture] - [Ignore] public class GenerateListReportFixture { private const string reportName = "ListBasedReport"; diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs index 0324ac551d..14da1e6303 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GeneratePlainReportFixture_2.cs @@ -16,37 +16,28 @@ using NUnit.Framework; namespace ICSharpCode.Reports.Addin.Test.Wizard { [TestFixture] - [Ignore] public class GeneratePlainReportFixture_2 { - ReportModel modelForStandardSettings; - - [Test] - public void FileName() - { - - ReportSettings settings = this.modelForStandardSettings.ReportSettings; - Assert.AreEqual(GlobalValues.PlainFileName,settings.FileName,"Wrong FileName"); - } + ReportModel mockReportModel; [Test] public void StandartPrinter () { - ReportSettings settings = this.modelForStandardSettings.ReportSettings; + ReportSettings settings = this.mockReportModel.ReportSettings; Assert.AreEqual(true,settings.UseStandardPrinter,"Standarprinter has should be 'true"); } [Test] public void PushPullModel () { - ReportSettings settings = this.modelForStandardSettings.ReportSettings; + ReportSettings settings = this.mockReportModel.ReportSettings; Assert.AreEqual(GlobalEnums.PushPullModel.FormSheet,settings.DataModel,"Wrong PusPullModel"); } [Test] public void DataAcessStuffShouldBeEmpty () { - ReportSettings settings = this.modelForStandardSettings.ReportSettings; + ReportSettings settings = this.mockReportModel.ReportSettings; Assert.IsTrue(String.IsNullOrEmpty(settings.ConnectionString),"ConnectionString should be empty"); Assert.IsTrue(String.IsNullOrEmpty(settings.CommandText),"CommandText should be empty"); Assert.AreEqual (System.Data.CommandType.Text,settings.CommandType); @@ -56,14 +47,14 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Test] public void ModelContainFiveSections () { - Assert.AreEqual(5,this.modelForStandardSettings.SectionCollection.Count); + Assert.AreEqual(5,this.mockReportModel.SectionCollection.Count); } [Test] public void PageHeaderShouldContainNoItem () { - ICSharpCode.Reports.Core.BaseSection s = this.modelForStandardSettings.ReportHeader; + ICSharpCode.Reports.Core.BaseSection s = this.mockReportModel.ReportHeader; ReportItemCollection c = s.Items; Assert.AreEqual(0,s.Items.Count); } @@ -72,7 +63,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Test] public void DetailShouldContainNoItem () { - ICSharpCode.Reports.Core.BaseSection s = this.modelForStandardSettings.DetailSection; + ICSharpCode.Reports.Core.BaseSection s = this.mockReportModel.DetailSection; Assert.AreEqual(0,s.Items.Count); } @@ -80,7 +71,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [Test] public void PageFooterShouldContainNoItem () { - ICSharpCode.Reports.Core.BaseSection s = this.modelForStandardSettings.PageFooter; + ICSharpCode.Reports.Core.BaseSection s = this.mockReportModel.PageFooter; Assert.AreEqual(0,s.Items.Count); } @@ -110,7 +101,7 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard [TestFixtureSetUp] public void CreateModels () { - this.modelForStandardSettings = CreateModel(); + this.mockReportModel = CreateModel(); } } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs index 0add01cf48..9e143ddc01 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/Generators/GenerateTableReportFixture.cs @@ -18,7 +18,6 @@ using NUnit.Framework; namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators { [TestFixture] - [Ignore] public class GenerateTableReportFixture { private const string reportName = "TableBasedReport"; diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs index de22c9a75b..4421c58bcd 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Test/Wizard/ReportStructureFixture.cs @@ -16,7 +16,6 @@ using NUnit.Framework; namespace ICSharpCode.Reports.Addin.Test.Wizard { [TestFixture] - [Ignore("ignore until problem with no installed printer is fixed")] public class ReportStructureFixture { [Test] diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs index bec193e34d..bbd17efab5 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs @@ -142,6 +142,10 @@ namespace ICSharpCode.Reports.Core { } + public static Size DefaultPageSize {get {return new Size(827,1169);}} + + public static Margins DefaultPageMargin {get {return new Margins(50,50,50,50);}} + #endregion diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportSettings.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportSettings.cs index fbf38054e3..8b7ea9015e 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportSettings.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportSettings.cs @@ -75,9 +75,9 @@ namespace ICSharpCode.Reports.Core{ private int rightMargin; private Size pageSize; -// public event EventHandler FileNameChanged; + #region Constructor - public ReportSettings():this(new Size(1169,827),"","") + public ReportSettings():this(GlobalValues.DefaultPageSize,"","") { } @@ -101,9 +101,8 @@ namespace ICSharpCode.Reports.Core{ } else { this.fileName = BuildFilename(fileName); } - - this.pageSize = pageSize; BaseValues(); + this.pageSize = pageSize; } @@ -113,16 +112,16 @@ namespace ICSharpCode.Reports.Core{ this.graphicsUnit = GraphicsUnit.Pixel; this.padding = new Padding(5); this.defaultFont = GlobalValues.DefaultFont; - this.availableFields = new AvailableFieldsCollection(); - sortingCollection = new SortColumnCollection(); - groupingsCollection = new ColumnCollection(); - parameterCollection = new ParameterCollection(); this.reportType = GlobalEnums.ReportType.FormSheet; this.dataModel = GlobalEnums.PushPullModel.FormSheet; - this.pageSize = new Size(827,1169); - this.topMargin = this.bottomMargin = this.leftMargin = this.rightMargin = 50; + this.pageSize = GlobalValues.DefaultPageSize; + this.topMargin = GlobalValues.DefaultPageMargin.Left; + this.bottomMargin = GlobalValues.DefaultPageMargin.Bottom; + this.leftMargin = GlobalValues.DefaultPageMargin.Left; + this.rightMargin = GlobalValues.DefaultPageMargin.Right; } + #endregion private static string BuildFilename (string file) { @@ -139,24 +138,6 @@ namespace ICSharpCode.Reports.Core{ } - #region Properties - - protected static string DefaultReportName - { - get { - return defaultReportName; - } - } - - protected static string DefaultFileName - { - get { - return GlobalValues.PlainFileName; - } - } - - - #endregion #region BaseSettings @@ -208,7 +189,6 @@ namespace ICSharpCode.Reports.Core{ #endregion - #region Page Settings [Category("Page Settings")] @@ -308,6 +288,9 @@ namespace ICSharpCode.Reports.Core{ public SortColumnCollection SortColumnCollection { get { + if (this.sortingCollection == null) { + return new SortColumnCollection(); + } return sortingCollection; } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs index 71d7a3a6fd..0f6761748a 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs @@ -9,62 +9,71 @@ using System; using System.Data; -using NUnit.Framework; -using ICSharpCode.Reports.Core; using System.Drawing; - +using System.IO; +using System.Windows.Forms; + +using ICSharpCode.Reports.Core; +using NUnit.Framework; + namespace ICSharpCode.Reports.Core.Test { [TestFixture] - [Ignore] + public class ReportSettingsFixture { const string reportName = "ReportName"; const string fileName = "FileName.srd"; - Size defaultSize = new Size(827,1169); + #region Constructor [Test] - public void DefaultConstructureNotNull() + public void DefaultConstructureShouldReturnStandardValues() { ReportSettings rs = new ReportSettings(); Assert.IsNotNull(rs,"Should not be 'null'"); Assert.AreEqual(GlobalValues.DefaultReportName,rs.ReportName,"Should be 'Report1'"); - Assert.AreEqual(GlobalValues.PlainFileName,rs.FileName,"Should be 'Report1.srd"); - Assert.AreEqual(defaultSize,rs.PageSize); + FileInfo fileInfo = new System.IO.FileInfo(rs.FileName); + Assert.AreEqual(GlobalValues.PlainFileName,fileInfo.Name,"Should be 'Report1.srd"); + Assert.AreEqual(GlobalValues.DefaultPageSize,rs.PageSize); } [Test] public void ConstructorWithParams () { - ReportSettings rs = new ReportSettings (this.defaultSize,reportName,"FileName"); + ReportSettings rs = new ReportSettings (GlobalValues.DefaultPageSize,reportName,"FileName"); Assert.IsNotNull(rs,"Should not be null"); - - Assert.AreEqual(defaultSize,rs.PageSize); + FileInfo fileInfo = new System.IO.FileInfo(rs.FileName); + Assert.AreEqual(GlobalValues.DefaultPageSize,rs.PageSize); Assert.AreEqual(reportName,rs.ReportName,"Should be 'ReportName'"); - Assert.AreEqual(fileName,rs.FileName,"Should be FileName.srd'"); + Assert.AreEqual(fileName,fileInfo.Name,"Should be FileName.srd'"); } [Test] public void ConstructorWithEmptyReportName () { - ReportSettings rs = new ReportSettings (defaultSize,"","FileName"); + ReportSettings rs = new ReportSettings (GlobalValues.DefaultPageSize,"","FileName"); + FileInfo fileInfo = new System.IO.FileInfo(rs.FileName); Assert.IsNotNull(rs,"Should not be null"); Assert.AreEqual(GlobalValues.DefaultReportName,rs.ReportName,"Should be 'Report1'"); - Assert.AreEqual(fileName,rs.FileName); + Assert.AreEqual(fileName,fileInfo.Name); } [Test] public void ConstructorWithEmptyFileName () { - ReportSettings rs = new ReportSettings (defaultSize,reportName,""); + ReportSettings rs = new ReportSettings (GlobalValues.DefaultPageSize,reportName,""); Assert.AreEqual(rs.ReportName,reportName,"Should be 'ReportName'"); - Assert.AreEqual(rs.FileName,GlobalValues.PlainFileName,"Should be 'report1.srd'"); + FileInfo fileInfo = new System.IO.FileInfo(rs.FileName); + Assert.AreEqual(GlobalValues.PlainFileName,fileInfo.Name,"Should be 'report1.srd'"); } + #endregion + + #region Collections [Test] public void CheckDefaultCollections () @@ -82,8 +91,12 @@ namespace ICSharpCode.Reports.Core.Test Assert.IsNotNull (rs.ParameterCollection); Assert.AreEqual (0,rs.ParameterCollection.Count); + Assert.IsNotNull(rs.AvailableFieldsCollection); + Assert.AreEqual(0,rs.AvailableFieldsCollection.Count); } + #endregion + [Test] public void CheckDefaultSettings () @@ -92,7 +105,7 @@ namespace ICSharpCode.Reports.Core.Test Assert.AreEqual(true,rs.UseStandardPrinter,"StandartPrinter should be 'true'"); Assert.AreEqual (rs.GraphicsUnit,System.Drawing.GraphicsUnit.Pixel,"GraphicsUnit should be 'millimeter'"); - Assert.AreEqual (new System.Windows.Forms.Padding(5),rs.Padding); +// Assert.AreEqual (new System.Windows.Forms.Padding(5),rs.Padding); Assert.AreEqual (GlobalEnums.ReportType.FormSheet,rs.ReportType); Assert.AreEqual (GlobalEnums.PushPullModel.FormSheet,rs.DataModel); @@ -105,6 +118,7 @@ namespace ICSharpCode.Reports.Core.Test Assert.AreEqual (10,rs.DefaultFont.Size); } + #region Report - FileName [Test] public void BlankReportNameReturnsDefaultReportName() @@ -119,9 +133,43 @@ namespace ICSharpCode.Reports.Core.Test { ReportSettings rs = new ReportSettings(); rs.FileName = String.Empty; - Assert.AreEqual(GlobalValues.PlainFileName,rs.FileName); + FileInfo fileInfo = new System.IO.FileInfo(rs.FileName); + Assert.AreEqual(GlobalValues.PlainFileName,fileInfo.Name); + } + + #endregion + + #region Size and margin + + [Test] + public void DefaultPageSize () + { + ReportSettings rs = new ReportSettings(); + Assert.AreEqual(GlobalValues.DefaultPageSize,rs.PageSize); + } + + [Test] + public void CustomePageSize () + { + Size customSize = new Size(200,150); + ReportSettings rs = new ReportSettings(customSize,"aa","bb"); + Assert.AreEqual(customSize,rs.PageSize); } + [Test] + public void DefaultReportMargin () + { + ReportSettings rs = new ReportSettings(); + System.Drawing.Printing.Margins margin = new System.Drawing.Printing.Margins(rs.LeftMargin,rs.RightMargin, + rs.TopMargin,rs.BottomMargin); + Assert.AreEqual(margin.Left,rs.LeftMargin); + Assert.AreEqual(GlobalValues.DefaultPageMargin,margin); + } + + #endregion + + + [TestFixtureSetUp] public void Init()