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 67f6671021..b1d4947a7a 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 @@ -32,10 +32,12 @@ namespace ICSharpCode.Reports.Core.Test.DataManager } + #region Group by String + [Test] public void GroupingCollection_Contains_IsGrouped_False() { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); Assert.That(dataNav.IsGrouped == true); } @@ -43,7 +45,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager [Test] public void Has_Children() { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); while (dataNav.MoveNext()) { Assert.That(dataNav.HasChildren,Is.True); } @@ -52,19 +54,59 @@ namespace ICSharpCode.Reports.Core.Test.DataManager [Test] public void Can_Read_Child_Count () { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); while (dataNav.MoveNext()) { Assert.That(dataNav.ChildListCount,Is.GreaterThan(0)); } } + #endregion + + + #region GroupbyDataTime + + [Test] + public void DateTimeCan_FillChild() + { + var dataNav = PrepareDateTimeGrouping(); + while (dataNav.MoveNext()) { + if (dataNav.HasChildren) { + Assert.That(dataNav.HasChildren,Is.True); + DataRow r = dataNav.Current as DataRow; + string v2 = r["last"].ToString() + " GroupVal :" + r[3].ToString(); + Console.WriteLine(v2); + FillChildList(dataNav); + } + + } + } + + + [Test] + public void DataTimeCollection_Contains_IsGrouped_False() + { + var dataNav = PrepareDateTimeGrouping(); + Assert.That(dataNav.IsGrouped == true); + } + + + [Test] + public void DataTime_Has_Children() + { + var dataNav = PrepareDateTimeGrouping(); + while (dataNav.MoveNext()) { + Assert.That(dataNav.HasChildren,Is.True); + } + } + #endregion + #region Read-Fill Child List [Test] public void Can_FillChild() { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); while (dataNav.MoveNext()) { if (dataNav.HasChildren) { Assert.That(dataNav.HasChildren,Is.True); @@ -105,7 +147,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager [Test] public void Can_Get_ChildNavigator () { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); while (dataNav.MoveNext()) { if (dataNav.HasChildren) { IDataNavigator child = dataNav.GetChildNavigator(); @@ -118,7 +160,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager [Test] public void RecursiveCall_Childs () { - var dataNav = PrepareStandardGrouping(); + var dataNav = PrepareStringGrouping(); dataNav.MoveNext(); Console.WriteLine("--------------start rec ------------"); reccall (dataNav); @@ -169,7 +211,9 @@ namespace ICSharpCode.Reports.Core.Test.DataManager #endregion - private IDataNavigator PrepareStandardGrouping () + + + private IDataNavigator PrepareStringGrouping () { GroupColumn gc = new GroupColumn("GroupItem",1,ListSortDirection.Ascending); ReportSettings rs = new ReportSettings(); @@ -177,6 +221,18 @@ namespace ICSharpCode.Reports.Core.Test.DataManager IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); return dm.GetNavigator; } + + + private IDataNavigator PrepareDateTimeGrouping () + { + GroupColumn gc = new GroupColumn("RandomDate",1,ListSortDirection.Ascending); + ReportSettings rs = new ReportSettings(); + rs.GroupColumnsCollection.Add(gc); + IDataManager dm = ICSharpCode.Reports.Core.DataManager.CreateInstance(this.table,rs); + return dm.GetNavigator; + } + + [TestFixtureSetUp] public void Init() { @@ -184,6 +240,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager this.table = contributorsList.ContributorTable; } + [TestFixtureTearDown] public void Dispose() { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs index 593d877d61..0cb95050a5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/TestHelpers/ContributorsList.cs @@ -54,26 +54,35 @@ namespace ICSharpCode.Reports.Core.Test.TestHelpers private ContributorCollection CreateContributorsList () { + + DateTime d1 = new DateTime(2000,11,11); + DateTime d2 = new DateTime(2000,01,01); + DateTime d3 = new DateTime(2000,12,24); + ContributorCollection list = new ContributorCollection(); list.Add(new Contributor("Christoph","Wille","Senior Project Wrangler",17,new DateTime(1960,12,8),"F")); list.Add(new Contributor("Bernhard","Spuida","Senior Project Wrangler",25,new DateTime(1962,2,24),"D")); - list.Add(new Contributor("Daniel","Grunwald","Technical Lead",12,new DateTime(1961,1,30),"F")); - list.Add(new Contributor("Matt","Ward","NUnit",7,new DateTime(62,4,8),"F")); - list.Add(new Contributor("David","Srbecky","Debugger",1,new DateTime(1961,11,19),"C")); - list.Add(new Contributor("Peter","Forstmeier","SharpDevelop.Reports",7,new DateTime(1962,10,27),"D")); - list.Add(new Contributor("Alexander","Zeitler","SharpDevelop.Reports",3,new DateTime(1961,9,9),"D")); - list.Add(new Contributor("Markus","Palme","Prg.",6,new DateTime(1960,2,12),"R")); - list.Add(new Contributor("Georg","Brandl","Prg.",5,new DateTime(2003,8,13),"R")); - list.Add(new Contributor("Roman","Taranchenko","",2,new DateTime(2002,6,6),"U")); - list.Add(new Contributor("Denis","Erchoff","",13,new DateTime(1961,5,15),"U")); - list.Add(new Contributor("Ifko","Kovacka","",31,new DateTime(1960,4,16),"A")); - list.Add(new Contributor("Nathan","Allen","",5,new DateTime(1962,2,8),"A")); - list.Add(new Contributor("Dickon","Field","DBTools",10,new DateTime(1961,10,3),"U")); - list.Add(new Contributor("Troy","Simpson","Prg.",9,new DateTime(1962,5,2),"C")); - list.Add(new Contributor("David","Alpert","Prg.",6,new DateTime(2000,5,1),"C")); + list.Add(new Contributor("Daniel","Grunwald","Technical Lead",12,d1,"F")); + + list.Add(new Contributor("Matt","Ward","NUnit",7,d1,"F")); + list.Add(new Contributor("David","Srbecky","Debugger",1,d1,"C")); + list.Add(new Contributor("Peter","Forstmeier","SharpDevelop.Reports",7,d1,"D")); + + list.Add(new Contributor("Alexander","Zeitler","SharpDevelop.Reports",3,d2,"D")); + list.Add(new Contributor("Markus","Palme","Prg.",6,d2,"R")); + list.Add(new Contributor("Georg","Brandl","Prg.",5,d2,"R")); + list.Add(new Contributor("Roman","Taranchenko","",2,d2,"U")); + list.Add(new Contributor("Denis","Erchoff","",13,d2,"U")); + + list.Add(new Contributor("Ifko","Kovacka","",31,d3,"A")); + list.Add(new Contributor("Nathan","Allen","",5,d3,"A")); + list.Add(new Contributor("Dickon","Field","DBTools",10,d3,"U")); + + list.Add(new Contributor("Troy","Simpson","Prg.",9,d3,"C")); + list.Add(new Contributor("David","Alpert","Prg.",6,d3,"C")); return list; }