From 965ea8dc4c7e717a5c5229282093d18b468b48c4 Mon Sep 17 00:00:00 2001
From: Peter Forstmeier <peter.forstmeier@t-online.de>
Date: Thu, 29 Jul 2010 18:15:35 +0000
Subject: [PATCH] ExplorerTree opens on start, update UnitTest's for
 Sorting/Grouping

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6316 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/ReportExplorer/ExplorerTree.cs    |  1 +
 .../Generators/GenarateListReportFixture.cs   | 25 ++++++++++++++++++-
 .../Generators/GenerateTableReportFixture.cs  | 25 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 2 deletions(-)

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 ecba581ba2..2d19f5bded 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
@@ -342,6 +342,7 @@ namespace ICSharpCode.Reports.Addin
 			SetSortColumns();
 			SetGroupColumns();
 			SetParameters();
+			this.ExpandAll();
 			this.EndUpdate();
 		}
 		
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 331a0ead97..eb7bc431ec 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
@@ -42,12 +42,23 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
 		}
 		
 		[Test]
-		public void GroupColumCollection_Should_Null ()
+		public void GroupColumCollection_Should_Empty ()
 		{
 			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
 			Assert.That(m.ReportSettings.GroupColumnsCollection,Is.Empty);
 		}
 		
+			
+		[Test]
+		public void SortColumnCollection_Should_Empty ()
+		{
+			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
+			Assert.That(m.ReportSettings.SortColumnsCollection,Is.Empty);
+		}
+		
+		#endregion
+		
+		#region Sort_Group
 		
 		[Test]
 		public void GroupColumCollection_Grouping_Should_Set()
@@ -60,7 +71,19 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
 			
 			Assert.AreEqual(rs.GroupColumnsCollection.Count,1);
 		}
+		
+
+		[Test]
+		public void SortColumCollection_Sorting_Should_Set()
+		{
+			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
+			var rs = m.ReportSettings;
 			
+			SortColumn gc = new SortColumn("GroupItem",ListSortDirection.Ascending);
+			rs.SortColumnsCollection.Add(gc);
+			
+			Assert.AreEqual(rs.SortColumnsCollection.Count,1);
+		}
 		#endregion
 		
 		
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 8447ad17b3..5ce62aa512 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
@@ -43,13 +43,24 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
 		
 		
 		[Test]
-		public void GroupColumCollection_Should_Null ()
+		public void GroupColumCollection_Should_Empty ()
 		{
 			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
 			Assert.That(m.ReportSettings.GroupColumnsCollection,Is.Empty);
 		}
 		
 		
+		[Test]
+		public void SortColumnCollection_Should_Empty ()
+		{
+			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
+			Assert.That(m.ReportSettings.SortColumnsCollection,Is.Empty);
+		}
+		
+		#endregion
+		
+		#region Sort/Group
+		
 		[Test]
 		public void GroupColumCollection_Grouping_Should_Set()
 		{
@@ -62,6 +73,18 @@ namespace ICSharpCode.Reports.Addin.Test.Wizard.Generators
 			Assert.AreEqual(rs.GroupColumnsCollection.Count,1);
 		}
 		
+		
+		[Test]
+		public void SortColumCollection_Sorting_Should_Set()
+		{
+			ReportModel m = ReportGenerationHelper.CreateModel(reportName);
+			var rs = m.ReportSettings;
+			
+			SortColumn gc = new SortColumn("GroupItem",ListSortDirection.Ascending);
+			rs.SortColumnsCollection.Add(gc);
+			
+			Assert.AreEqual(rs.SortColumnsCollection.Count,1);
+		}
 		#endregion