diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index 24f815ebb4..6011a6d148 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -295,7 +295,7 @@ namespace ICSharpCode.Reports.Addin this.MakeDirty(); ReportExplorerPad explorerPad = CheckReportExplorer(); IComponentChangeService change = Host.GetService(typeof(IComponentChangeService)) as IComponentChangeService; - change.OnComponentChanged(explorerPad.ReportModel.ReportSettings.SortColumnCollection, null, null, null); + change.OnComponentChanged(explorerPad.ReportModel.ReportSettings.SortColumnsCollection, null, null, null); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs index 05defae00e..5eb0446d3f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportExplorer/ExplorerTree.cs @@ -133,7 +133,7 @@ namespace ICSharpCode.Reports.Addin this.SelectedNode = newNode; this.CheckNode (newNode); sectionNode.Nodes.Add(newNode); - this.reportModel.ReportSettings.SortColumnCollection.Add(new SortColumn(newNode.Text, + this.reportModel.ReportSettings.SortColumnsCollection.Add(new SortColumn(newNode.Text, ListSortDirection.Ascending, typeof(System.String),false)); this.OnPropertyChanged ("Sort_Group"); @@ -211,9 +211,9 @@ namespace ICSharpCode.Reports.Addin public void RemoveNode() { if (this.SelectedNode != null) { - AbstractColumn abstr = this.reportModel.ReportSettings.SortColumnCollection.Find(this.SelectedNode.Text); + AbstractColumn abstr = this.reportModel.ReportSettings.SortColumnsCollection.Find(this.SelectedNode.Text); if (abstr != null) { - this.reportModel.ReportSettings.SortColumnCollection.Remove(abstr as SortColumn); + this.reportModel.ReportSettings.SortColumnsCollection.Remove(abstr as SortColumn); } TreeNode parent = this.SelectedNode.Parent; this.SelectedNode.Remove(); @@ -225,7 +225,7 @@ namespace ICSharpCode.Reports.Addin public void ClearSection () { this.nodeSorting.Nodes.Clear(); - this.reportModel.ReportSettings.SortColumnCollection.Clear(); + this.reportModel.ReportSettings.SortColumnsCollection.Clear(); this.OnPropertyChanged ("ClearSection"); } @@ -243,7 +243,7 @@ namespace ICSharpCode.Reports.Addin scn.ImageIndex = ascendingIcon; scn.SelectedImageIndex = ascendingIcon; } - SortColumn abstr = (SortColumn)this.reportModel.ReportSettings.SortColumnCollection.Find(this.SelectedNode.Text); + SortColumn abstr = (SortColumn)this.reportModel.ReportSettings.SortColumnsCollection.Find(this.SelectedNode.Text); abstr.SortDirection = scn.SortDirection; this.OnPropertyChanged ("ToggleSortOrder"); } @@ -272,7 +272,7 @@ namespace ICSharpCode.Reports.Addin { this.nodeSorting.Nodes.Clear(); SortColumnNode scn = null; - foreach (SortColumn sc in this.reportModel.ReportSettings.SortColumnCollection){ + foreach (SortColumn sc in this.reportModel.ReportSettings.SortColumnsCollection){ if (sc.SortDirection == ListSortDirection.Ascending) { scn = new SortColumnNode (sc.ColumnName,ascendingIcon,"/SharpDevelopReports/ContextMenu/FieldsExplorer/ColumnTreeNode"); } else { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs index c81608faf4..e3f807a7a2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs @@ -211,15 +211,15 @@ namespace ICSharpCode.Reports.Core { public override void Sort() { base.Sort(); - if ((base.ReportSettings.SortColumnCollection != null)) { - if (base.ReportSettings.SortColumnCollection.Count > 0) { + if ((base.ReportSettings.SortColumnsCollection != null)) { + if (base.ReportSettings.SortColumnsCollection.Count > 0) { // base.IndexList = this.BuildSortIndex (base.CreateSortCollection()); - base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnCollection)); + base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = true; // BaseListStrategy.CheckSortArray (base.IndexList,"TableStrategy - CheckSortArray"); } else { - base.IndexList = this.IndexBuilder(base.CreateSortCollection(ReportSettings.SortColumnCollection)); + base.IndexList = this.IndexBuilder(base.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = false; } } @@ -243,7 +243,7 @@ namespace ICSharpCode.Reports.Core { return; } */ - if (base.ReportSettings.SortColumnCollection != null) { + if (base.ReportSettings.SortColumnsCollection != null) { this.Sort (); } Reset(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs index d6bc11f855..0ad5f432e2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs @@ -94,13 +94,13 @@ namespace ICSharpCode.Reports.Core public override void Sort() { base.Sort(); - if ((base.ReportSettings.SortColumnCollection != null)) { - if (base.ReportSettings.SortColumnCollection.Count > 0) { - base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnCollection)); + if ((base.ReportSettings.SortColumnsCollection != null)) { + if (base.ReportSettings.SortColumnsCollection.Count > 0) { + base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = true; } else { // if we have no sorting, we build the indexlist as well - base.IndexList = this.IndexBuilder(ReportSettings.SortColumnCollection); + base.IndexList = this.IndexBuilder(ReportSettings.SortColumnsCollection); base.IsSorted = false; } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs index 7ee4d28b2d..aa4e05d158 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -103,7 +103,7 @@ namespace ICSharpCode.Reports.Core { if (reportParameters != null) { if (reportParameters.SortColumnCollection.Count > 0) { - model.ReportSettings.SortColumnCollection.AddRange(reportParameters.SortColumnCollection); + model.ReportSettings.SortColumnsCollection.AddRange(reportParameters.SortColumnCollection); } if (reportParameters.SqlParameters.Count > 0) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs index a9fd223a18..788e88960d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportSettings.cs @@ -223,13 +223,13 @@ namespace ICSharpCode.Reports.Core{ /// Get/Set a Collection of SortColumn /// - - public ColumnCollection SortColumnCollection { + [Category("Sorting/Grouping")] + public ColumnCollection SortColumnsCollection { get {return sortingCollection;} } - [Browsable(false)] + [Category("Sorting/Grouping")] public ColumnCollection GroupColumnsCollection { get { return groupingsCollection; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs index e8ae952931..4054087b63 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs @@ -44,18 +44,6 @@ namespace ICSharpCode.Reports.Core.Test.DataManager } - [Test] - public void aaAddGroupToSettings () - { - GroupColumn gc = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); - ReportSettings rs = new ReportSettings(); - - rs.GroupColumnsCollection.Add(gc); - Assert.AreEqual(1,rs.GroupColumnsCollection.Count); - } - - - [Test] public void aaa() { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs index e3462ec988..958093e2bd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/IListDataManagerFixture.cs @@ -138,7 +138,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager { SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,rs); DataNavigator dataNav = dm.GetNavigator; string v1 = String.Empty; @@ -185,7 +185,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Ascending, typeof(System.Int16),false); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,rs); DataNavigator dataNav = dm.GetNavigator; DateTime d1 = new DateTime(1,1,1); @@ -204,7 +204,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Descending, typeof(System.Int16),false); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,rs); DataNavigator dataNav = dm.GetNavigator; DateTime d1 = new DateTime(2099,12,30); @@ -224,8 +224,8 @@ namespace ICSharpCode.Reports.Core.Test.DataManager SortColumn sc1 = new SortColumn("RandomInt",System.ComponentModel.ListSortDirection.Ascending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - rs.SortColumnCollection.Add(sc1); + rs.SortColumnsCollection.Add(sc); + rs.SortColumnsCollection.Add(sc1); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,rs); DataNavigator dataNav = dm.GetNavigator; string v1 = String.Empty; @@ -247,7 +247,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager { SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Descending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.contributorCollection,rs); DataNavigator dataNav = dm.GetNavigator; string compareTo = "z"; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs index 6eea9f50f4..110031abf3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/Strategy/TableStrategyFixture.cs @@ -29,16 +29,60 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.Strategy Assert.That(ts != null); } + + #region Grouping + + [Test] + public void Add_GroupColumn_IsGrouped_true() + { + GroupColumn gc = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); + TableStrategy tableStrategy =GroupTableStrategyFactory (gc); + tableStrategy.Bind(); + Assert.That(tableStrategy.IsGrouped == true); + } + + + + + [Test] + public void CanGroup_All_Elements_are_GroupComparer () + { + GroupColumn groupComparer = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); + TableStrategy tableStrategy =GroupTableStrategyFactory (groupComparer); + tableStrategy.Bind(); + foreach (BaseComparer element in tableStrategy.IndexList) + { + GroupComparer checkComparer = element as GroupComparer; + Assert.IsNotNull(checkComparer); + } + } + + + [Test] + public void CanGroup_All_Elements_Contains_Children () + { + GroupColumn groupComparer = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); + TableStrategy tableStrategy =GroupTableStrategyFactory (groupComparer); + tableStrategy.Bind(); + foreach (BaseComparer element in tableStrategy.IndexList) + { + GroupComparer checkComparer = element as GroupComparer; + Assert.That(checkComparer.IndexList.Count > 0); + } + } + + #endregion + + + #region Sorting [Test] public void TableStrategy_Set_IsSorted() { SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); - ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - TableStrategy ts = new TableStrategy(table,rs); - ts.Bind(); - Assert.That(ts.IsSorted == true); + var tableStrategy = SortTableStrategyFactory(sc); + tableStrategy.Bind(); + Assert.That(tableStrategy.IsSorted == true); } @@ -46,13 +90,68 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.Strategy public void CanSort_String_Ascending() { SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); - ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + var tableStrategy = SortTableStrategyFactory(sc); + tableStrategy.Bind(); + string v1 = String.Empty; + foreach (BaseComparer element in tableStrategy.IndexList) { + string v2 = element.ObjectArray[0].ToString(); + Assert.LessOrEqual(v1,v2); + v1 = v2; + } + } + + + [Test] + public void CanSort_DateTime_Ascending() + { + SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Ascending, + typeof(System.Int16),false); + + var tableStrategy =SortTableStrategyFactory (sc); + + DateTime d1 = new DateTime(1,1,1); + + foreach (BaseComparer element in tableStrategy.IndexList) { + + DateTime d2 = Convert.ToDateTime(element.ObjectArray[0].ToString()); + Assert.LessOrEqual(d1,d2); + d1 = d2; + } + } + + + [Test] + public void CanSort_DateTime_Descending() + { + SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Descending, + typeof(System.Int16),false); + + var tableStrategy = SortTableStrategyFactory(sc); + DateTime d1 = new DateTime(1,1,1); + + foreach (BaseComparer element in tableStrategy.IndexList) { - TableStrategy ts = new TableStrategy(table,rs); - ts.Bind(); + DateTime d2 = Convert.ToDateTime(element.ObjectArray[0].ToString()); + Assert.GreaterOrEqual(d1,d2); + d1 = d2; + } + } + + + [Test] + public void CanSort_Ascending_By_TwoColumns() + { + SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); + SortColumn sc1 = new SortColumn("RandomInt",System.ComponentModel.ListSortDirection.Ascending); + + ReportSettings reportSettings = new ReportSettings(); + reportSettings.SortColumnsCollection.Add(sc); + reportSettings.SortColumnsCollection.Add(sc1); + + var tableStrategy = new TableStrategy(this.table,reportSettings); string v1 = String.Empty; - foreach (BaseComparer element in ts.IndexList) { + + foreach (BaseComparer element in tableStrategy.IndexList) { string v2 = element.ObjectArray[0].ToString(); Assert.LessOrEqual(v1,v2); v1 = v2; @@ -60,6 +159,24 @@ namespace ICSharpCode.Reports.Core.Test.DataManager.Strategy } + #endregion + + private TableStrategy SortTableStrategyFactory (SortColumn sortColumn) + { + var reportSettings = new ReportSettings(); + reportSettings.SortColumnsCollection.Add(sortColumn); + var tableStrategy = new TableStrategy(this.table,reportSettings); + return tableStrategy; + } + + + private TableStrategy GroupTableStrategyFactory (GroupColumn sortColumn) + { + var reportSettings = new ReportSettings(); + reportSettings.GroupColumnsCollection.Add(sortColumn); + var tableStrategy = new TableStrategy(this.table,reportSettings); + return tableStrategy; + } [TestFixtureSetUp] public void Init() { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs index 7867f1cab0..e40ef46a51 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/TableDataManagerFixture.cs @@ -9,6 +9,7 @@ using System; using System.Collections; +using System.ComponentModel; using System.Data; using ICSharpCode.Reports.Core; @@ -109,79 +110,29 @@ namespace ICSharpCode.Reports.Core.Test.DataManager { SortColumn sc = new SortColumn("notexist",System.ComponentModel.ListSortDirection.Ascending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); DataNavigator dataNav = dm.GetNavigator; } + #region Grouping - #region Sorting - //Tests moved to \Strategy - /* [Test] - public void SortAscendingByOneColumn() + public void can_add_GroupColumn () { - SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); - ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); - DataNavigator dataNav = dm.GetNavigator; - string v1 = String.Empty; - while (dataNav.MoveNext()) { - DataRow r = dataNav.Current as DataRow; - string v2 = r["last"].ToString(); - Assert.LessOrEqual(v1,v2); - v1 = v2; - } - Assert.IsTrue(dataNav.IsSorted); - } - */ - /* - [Test] - [Ignore("Sort of integer not working")] - public void SortAscendingByInteger() - { - SortColumn sc = new SortColumn("RandomInt",System.ComponentModel.ListSortDirection.Ascending, - typeof(System.Int16),false); + GroupColumn gc = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); - DataNavigator dataNav = dm.GetNavigator; - string v1 = String.Empty; - while (dataNav.MoveNext()) { - DataRow r = dataNav.Current as DataRow; - string v2 = r["randomInt"].ToString(); -// string ss = String.Format("< {0} > <{1}>",v1,v2); - //Console.WriteLine(v2); - Assert.LessOrEqual(v1,v2); - v1 = v2; - } - Assert.IsTrue(dataNav.IsSorted); + + rs.GroupColumnsCollection.Add(gc); + Assert.AreEqual(1,rs.GroupColumnsCollection.Count); } - */ - [Test] - public void SortAscendingByDateTime() - { - SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Ascending, - typeof(System.Int16),false); - ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); - DataNavigator dataNav = dm.GetNavigator; - DateTime d1 = new DateTime(1,1,1); - while (dataNav.MoveNext()) { - DataRow r = dataNav.Current as DataRow; - DateTime d2 = Convert.ToDateTime(r["randomDate"]); -// string ss = String.Format("<{0}>",d2); -// Console.WriteLine(ss); - Assert.LessOrEqual(d1,d2); - d1 = d2; - } - Assert.IsTrue(dataNav.IsSorted); - } + #endregion + #region Sorting + //Tests moved to \Strategy + [Test] public void SortDescendingByDateTime() @@ -189,7 +140,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager SortColumn sc = new SortColumn("RandomDate",System.ComponentModel.ListSortDirection.Descending, typeof(System.Int16),false); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); DataNavigator dataNav = dm.GetNavigator; DateTime d1 = new DateTime(2099,12,30); @@ -205,36 +156,12 @@ namespace ICSharpCode.Reports.Core.Test.DataManager } - [Test] - public void SortAscendingByTwoColumns() - { - SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Ascending); - SortColumn sc1 = new SortColumn("RandomInt",System.ComponentModel.ListSortDirection.Ascending); - - ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); - rs.SortColumnCollection.Add(sc1); - IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); - DataNavigator dataNav = dm.GetNavigator; - string v1 = String.Empty; - while (dataNav.MoveNext()) { - DataRow r = dataNav.Current as DataRow; - string v2 = r["last"].ToString() + "-" + r["RandomInt"].ToString(); - //string ss = String.Format("< {0} > <{1}>",v1,v2); - //Console.WriteLine(ss); - //Console.WriteLine(v2); - Assert.LessOrEqual(v1,v2); - v1 = v2; - } - Assert.IsTrue(dataNav.IsSorted); - } - [Test] public void SortDescendingByOneColumn() { SortColumn sc = new SortColumn("Last",System.ComponentModel.ListSortDirection.Descending); ReportSettings rs = new ReportSettings(); - rs.SortColumnCollection.Add(sc); + rs.SortColumnsCollection.Add(sc); IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); DataNavigator dataNav = dm.GetNavigator; string compareTo = "z"; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs index 0f6761748a..54ec7ef20f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportSettings/ReportSettingsFixture.cs @@ -85,8 +85,8 @@ namespace ICSharpCode.Reports.Core.Test Assert.IsNotNull (rs.GroupColumnsCollection); Assert.AreEqual (0,rs.GroupColumnsCollection.Count); - Assert.IsNotNull (rs.SortColumnCollection); - Assert.AreEqual (0,rs.SortColumnCollection.Count); + Assert.IsNotNull (rs.SortColumnsCollection); + Assert.AreEqual (0,rs.SortColumnsCollection.Count); Assert.IsNotNull (rs.ParameterCollection); Assert.AreEqual (0,rs.ParameterCollection.Count);