Work on new Exporter, Event's are raised

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5849 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -127,10 +127,12 @@
     <Compile Include="Project\Exceptions\UnknownItemException.cs" />
     <Compile Include="Project\Exceptions\WrongColumnException.cs" />
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
+    <Compile Include="Project\Exporter\AbstractExportListBuilder.cs" />
     <Compile Include="Project\Exporter\AbstractReportCreator.cs" />
     <Compile Include="Project\Exporter\Converter\ItemsConverter.cs" />
     <Compile Include="Project\Exporter\DataExportListBuilder.cs" />
     <Compile Include="Project\Exporter\DataReportCreator.cs" />
+    <Compile Include="Project\Exporter\PageCreatedEventArgs.cs" />
     <Compile Include="Project\Exporter\PageDescription.cs" />
     <Compile Include="Project\old_Exporter\BasePager.cs" />
     <Compile Include="Project\old_Exporter\Converters\BaseConverter.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractExportListBuilder.cs

@@ -0,0 +1,192 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 24.05.2010
+ * Time: 19:53
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using ICSharpCode.Reports.Core.Exporter.Converter;
+using ICSharpCode.Reports.Core.Interfaces;
+
+
+namespace ICSharpCode.Reports.Core.Exporter
+{
+	/// <summary>
+	/// Description of AbstractExportListBuilder.
+	/// </summary>
+	public class AbstractExportListBuilder
+	{
+		
+		private readonly object pageLock = new object();
+		private readonly IItemsConverter itemsConverter;
+		
+		private PageDescriptions pages;
+		
+		public event EventHandler<NewPageCreatedEventArgs> PageCreated;
+		public event EventHandler<SectionRenderEventArgs> SectionRendering;
+		
+		
+		public AbstractExportListBuilder (IReportModel reportModel,IItemsConverter itemsConverter)
+		{
+			this.ReportModel = reportModel;
+			this.itemsConverter = itemsConverter;
+		}
+		
+		
+		public virtual void WritePages ()
+		{
+			
+		}
+		
+		
+		
+		
+		
+		
+		
+		protected virtual Point BuildReportHeader (Point reportHeaderStart)
+		{
+			System.Console.WriteLine("BuildReportHeader at {0} with {1} items ",reportHeaderStart,ReportModel.ReportHeader.Items.Count);
+			
+			BaseSection section = ReportModel.ReportHeader;
+			Size size = section.Size;
+			Point retval = Point.Empty;
+			
+			if ((!CanGrow(section.Items)) | (!CanShrink(section.Items))) {
+				ReportItemCollection result = itemsConverter.Convert(section,section.Items);
+				this.SinglePage.Items.AddRange(result);
+				
+				retval = itemsConverter.LocationAfterConvert;
+			} else {
+				retval = new Point (reportHeaderStart.X , 150);
+			}
+			
+			return retval;
+		}
+		
+		
+		private bool CanGrow (IEnumerable<BaseReportItem> collection)
+		{
+			IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in collection where bt.CanGrow == true select bt;
+			return (canGrowShrinkCollection.Count() > 0);
+		}
+		
+		
+		private bool CanShrink (IEnumerable<BaseReportItem> collection)
+		{
+			IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in collection where bt.CanShrink == true select bt;
+			return (canGrowShrinkCollection.Count() > 0);
+		}
+		
+		
+		protected virtual void BuildPageHeader ()
+		{
+			System.Diagnostics.Trace.WriteLine(" BuildPageHeader");
+		}
+		
+		
+		protected virtual void BuildDetailInternal (BaseSection section)
+		{
+			System.Diagnostics.Trace.WriteLine("BuildDetailInterna ");
+		}
+		
+		
+		protected virtual void BuildPageFooter ()
+		{
+			System.Diagnostics.Trace.WriteLine("BuildPageFooter ");
+		}
+		
+		protected virtual void BuildReportFooter ()
+		{
+			System.Diagnostics.Trace.WriteLine("BuildReportFooter ");
+		}
+		
+		
+		protected virtual void CreateNewPage ()
+		{
+			this.SinglePage = this.InitNewPage();
+			
+			
+			PrintHelper.InitPage(this.SinglePage,this.ReportModel.ReportSettings);
+			this.SinglePage.CalculatePageBounds(this.ReportModel);
+			
+//			this.pageFull = false;
+		}
+		
+		
+		
+		
+		private  PageDescription InitNewPage ()
+		{
+			SectionBounds sectionBounds  = new SectionBounds (ReportModel.ReportSettings,(this.Pages.Count == 0));
+			return new PageDescription(sectionBounds,Pages.Count + 1);
+		}
+		
+		
+		
+		protected  void AddPage (PageDescription page)
+		{
+			if (page == null) {
+				throw new ArgumentNullException("page");
+			}
+//			lock (addLock) {
+				Pages.Add(page);
+				
+//			}
+			FirePageCreated(page);
+		}
+		
+		
+		#region Event's
+		
+		
+		protected void FirePageCreated(PageDescription page)
+		{
+			EventHelper.Raise<NewPageCreatedEventArgs>(PageCreated,this,
+			                                        new NewPageCreatedEventArgs(page));
+		}
+		
+		
+		protected void FireSectionRenderEvent (BaseSection section,int currentRow)
+		{
+			SectionRenderEventArgs ea =
+				new SectionRenderEventArgs(section,
+				                           pages.Count,
+				                           currentRow,
+				                           section);
+			
+			EventHelper.Raise<SectionRenderEventArgs>(SectionRendering,this,ea);
+		}
+		
+		
+		#endregion
+		
+		
+		public PageDescription SinglePage {get;private set;}
+		
+		public IReportModel ReportModel {get;private set;}
+		
+		public	Point PositionAfterRenderSection {get;set;}
+		
+		
+		public PageDescriptions Pages
+		{
+			get {
+				lock(pageLock) {
+					if (this.pages == null) {
+						pages = new PageDescriptions();
+						
+					}
+					return pages;
+				}
+			}
+		}
+		
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
+using iTextSharp.text;
 
 namespace ICSharpCode.Reports.Core.Exporter.Converter
 {
@@ -37,18 +38,33 @@ namespace ICSharpCode.Reports.Core.Exporter.Converter
 		}
 		
 		
+		
 		public ReportItemCollection Convert (BaseReportItem parent,IEnumerable<BaseReportItem> itemsSource)
 		{
-			var col =  new ReportItemCollection();
-			foreach (BaseReportItem element in itemsSource) {
-				
-				col.Add(element);
+			var col =  new ReportItemCollection();	
+			foreach (BaseReportItem item in itemsSource) {
+				item.Location = AdjustLocation (parent,item);
+				col.Add(item);
 			}
-			this.locationAfterConvert = new Point(parent.Size.Width,parent.Size.Height);
+			this.locationAfterConvert = AdjustLocationAfterDraw(parent);
 			return col;
 		}
 		
 		
+		
+		
+		private Point AdjustLocation (IReportItem parent , IReportItem item)
+		{
+			return new Point(parent.Location.X + item.Location.X,parent.Location.Y + item.Location.Y);
+		}
+			
+		
+		private Point AdjustLocationAfterDraw (IReportItem parent)
+		{
+			return new Point(parent.Location.X + parent.Size.Width,parent.Location.Y + parent.Size.Height);
+		}
+		
+		
 		public Point LocationAfterConvert {
 			get { return locationAfterConvert; }
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataExportListBuilder.cs

@@ -7,11 +7,9 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
-using System.Linq;
-
+using ICSharpCode.Reports.Core.Exporter.Converter;
 using ICSharpCode.Reports.Core.Interfaces;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -23,10 +21,19 @@ namespace ICSharpCode.Reports.Core.Exporter
 	{
 		
 		
-		public DataExportListBuilder(IReportModel reportModel,IDataManager dataManager):base(reportModel)
+		public DataExportListBuilder(IReportModel reportModel,IDataManager dataManager):base(reportModel,new ItemsConverter())
 		{
 			this.DataManager = dataManager;
 			this.DataManager.GetNavigator.MoveNext();
+			
+		}
+		
+		/// <summary>
+		/// This constructor os ONLY for testing reasons
+		/// </summary>
+		
+		public DataExportListBuilder (IReportModel reportModel,IDataManager dataManager,IItemsConverter itemsConverter):base(reportModel,itemsConverter)
+		{
 		}
 		
 		
@@ -36,7 +43,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 			base.PositionAfterRenderSection = this.BuildReportHeader(SinglePage.SectionBounds.ReportHeaderRectangle.Location);
 			
-			this.BuildPageHeader();
+//			this.BuildPageHeader();
 			
 //			BaseSection section = base.ReportModel.DetailSection;
 //
@@ -46,180 +53,34 @@ namespace ICSharpCode.Reports.Core.Exporter
 //			this.BuildReportFooter(SectionBounds.ReportFooterRectangle);
 //			this.BuildPageFooter();
 //			//this is the last Page
-			this.AddPage(base.SinglePage);
+			base.AddPage(base.SinglePage);
 			//base.FinishRendering(this.dataNavigator);
 		}
 		
 		
-		
-		
-		public IDataManager DataManager {get; private set;}
-		
-	}
-	
-	public class PageDescriptions :Collection<PageDescription>
-	{
-		
-	}
-		
-	
-	public class AbstractExportListBuilder
-	{
-		
-		private PageDescriptions pages;
-		private readonly object pageLock = new object();
-		
-		
-		public AbstractExportListBuilder (IReportModel reportModel)
-		{
-			this.ReportModel = reportModel;
-		}
-		
-		
-		public virtual void WritePages ()
+		protected override System.Drawing.Point BuildReportHeader(System.Drawing.Point reportHeaderStart)
 		{
 			
+			Point p =  base.BuildReportHeader(reportHeaderStart);
+			base.FireSectionRenderEvent(ReportModel.ReportHeader,0);
+			return p;
 		}
 		
 		
-		private ReportItemCollection ConvertContainer (ISimpleContainer container)
-		{
-			var col = new ReportItemCollection();
-			foreach (BaseReportItem element in container.Items)
-			{
-				col.Add(element);
-			}
-			return col;
-		}
-		
-		
-		
-		private void ConvertSimpleItems (IEnumerable<BaseReportItem> items)
-		{
-			foreach (BaseReportItem element in items) {
-				var container = element as ISimpleContainer;
-				
-				if (container != null) {
-					Console.WriteLine(" is recursive");
-					container.Items.AddRange(ConvertContainer (container));
-				}
-				
-				this.SinglePage.Items.Add(element);
-			}
-		}
-		
-		
-		private bool CanGrow (IEnumerable<BaseReportItem> collection)
+		protected override void BuildPageHeader()
 		{
-			IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in collection where bt.CanGrow == true select bt;
-			return (canGrowShrinkCollection.Count() > 0);
-		}
-		
+			base.BuildPageHeader();
 		
-		private bool CanShrink (IEnumerable<BaseReportItem> collection)
-		{
-			IEnumerable<BaseReportItem> canGrowShrinkCollection = from bt in collection where bt.CanShrink == true select bt;
-			return (canGrowShrinkCollection.Count() > 0);
 		}
 		
 		
+		public IDataManager DataManager {get; private set;}
 		
-		protected virtual Point BuildReportHeader (Point reportHeaderStart)
-		{
-			System.Console.WriteLine("BuildReportHeader at {0} with {1} items ",reportHeaderStart,ReportModel.ReportHeader.Items.Count);
-			
-			BaseSection section = ReportModel.ReportHeader;
-			Size size = section.Size;
-			Point retval = Point.Empty;
-			
-			if ((!CanGrow(section.Items)) | (!CanShrink(section.Items))) {
-				ConvertSimpleItems (section.Items);
-				retval = new Point (reportHeaderStart.X , reportHeaderStart.Y + size.Height);
-			} else {
-				retval = new Point (reportHeaderStart.X , 150);
-			}
-			
-			return retval;
-		}
-		
-		
-		
-		protected virtual void BuildPageHeader ()
-		{
-//			System.Diagnostics.Trace.WriteLine(" BuildPageHeader");
-//			PositionAfterRenderSection = new Point(PositionAfterRenderSection.X,PositionAfterRenderSection.Y + 20);
-		}
-		
-		
-		protected virtual void BuildDetailInternal (BaseSection section)
-		{
-			System.Diagnostics.Trace.WriteLine("BuildDetailInterna ");
-		}
-		
-		
-		protected virtual void BuildPageFooter ()
-		{
-			System.Diagnostics.Trace.WriteLine("BuildPageFooter ");
-		}
-		
-		protected virtual void BuildReportFooter ()
-		{
-			System.Diagnostics.Trace.WriteLine("BuildReportFooter ");
-		}
-		
-		
-		public virtual void CreateNewPage ()
-		{
-			this.SinglePage = this.InitNewPage();
-			PrintHelper.InitPage(this.SinglePage,this.ReportModel.ReportSettings);	
-			this.SinglePage.CalculatePageBounds(this.ReportModel);
-//			this.pageFull = false;
-		}
-		
-		public	Point PositionAfterRenderSection {get;set;}
-		
-		
-		protected PageDescription InitNewPage ()
-		{
-			SectionBounds sectionBounds  = new SectionBounds (ReportModel.ReportSettings,(this.Pages.Count == 0));
-			return new PageDescription(sectionBounds,Pages.Count + 1);
-		}
-		
-		
-		
-		protected  void AddPage (PageDescription page)
-		{
-			if (page == null) {
-				throw new ArgumentNullException("page");
-			}
-//			lock (addLock) {
-				Pages.Add(page);
-				
-//			}
-			//FirePageCreated(page);
-		}
-		
-		
-		
-		
-		
-		public PageDescription SinglePage {get;private set;}
-		
-		public IReportModel ReportModel {get;private set;}
-		
-		
-		public PageDescriptions Pages
-		{
-			get {
-				lock(pageLock) {
-					if (this.pages == null) {
-						pages = new PageDescriptions();
-						
-					}
-					return pages;
-				}
-			}
-		}
+	}
+	
+	public class PageDescriptions :Collection<PageDescription>
+	{
 		
 	}
+	
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs

@@ -19,10 +19,14 @@ namespace ICSharpCode.Reports.Core.Exporter
 	public class DataReportCreator:AbstractReportCreator
 	{
 		
+		IReportModel reportModel;
 		IDataManager dataManager;
+		ILayouter layouter;
 		
 		#region Constructor
 		
+		
+		
 		public static AbstractReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
 		{
 			if (reportModel == null) {
@@ -35,13 +39,17 @@ namespace ICSharpCode.Reports.Core.Exporter
 				throw new ArgumentNullException("layouter");
 			}
 			var instance = new DataReportCreator(reportModel,dataManager,layouter);
+			
 			return instance;
 		}
 		
 		
 		private DataReportCreator (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel) 
 		{
+			this.reportModel = reportModel;
 			this.dataManager = dataManager;
+			this.layouter = layouter;
+			
 			base.AbstractExportListBuilder = new DataExportListBuilder(reportModel,dataManager);
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageCreatedEventArgs.cs

@@ -0,0 +1,31 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 24.05.2010
+ * Time: 20:04
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using ICSharpCode.Reports.Core.Exporter;
+
+namespace ICSharpCode.Reports.Core.Exporter
+{
+	/// <summary>
+	/// Description of PageCreatedEventArgs.
+	/// </summary>
+	public class NewPageCreatedEventArgs:System.EventArgs
+	{
+		PageDescription			singlePage;
+		
+		public NewPageCreatedEventArgs(PageDescription page)
+		{
+			this.singlePage = page;
+		}
+		
+		
+		public PageDescription SinglePage {
+			get { return singlePage; }
+		}
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageDescription.cs

@@ -29,6 +29,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			this.SectionBounds = sectionBounds; 
 		}
 		
+		
 		public ReportItemCollection Items
 		{
 			get {
@@ -39,14 +40,5 @@ namespace ICSharpCode.Reports.Core.Exporter
 			}
 		}
 		
-//		public ExporterCollection Items
-//		{
-//			get {
-//				if (this.items == null) {
-//					items = new ExporterCollection();
-//				}
-//				return items;
-//			}
-//		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/AbstractExportListBuilder.cs

@@ -0,0 +1,22 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 24.05.2010
+ * Time: 19:52
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+
+namespace ICSharpCode.Reports.Core.Test.Exporter
+{
+	/// <summary>
+	/// Description of AbstractExportListBuilder.
+	/// </summary>
+	public class AbstractExportListBuilder
+	{
+		public AbstractExportListBuilder()
+		{
+		}
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/Converter/ItemsConverterFixture.cs

@@ -26,15 +26,51 @@ namespace ICSharpCode.Reports.Core.Test.Exporter.Converter
 			section.Items.Add(CreateSimpeTextItem());
 			Point point = new Point(1,1);
 			ReportItemCollection result = Sut.Convert (section,section.Items);
+			
 			Assert.AreEqual(new Point(section.Size.Width,section.Size.Height),Sut.LocationAfterConvert);
 			Assert.AreEqual(1,result.Count);
 			
 		}
 		
+		[Test]
+		public void Check_Location_Of_ItemInSection ()
+		{
+			BaseSection section = new BaseSection();
+			section.Location = new Point (10,10);
+			
+			var textItem = CreateSimpeTextItem();
+			section.Items.Add(textItem);
+			
+			Point checkPoint = new Point(section.Location.X + textItem.Location.X,section.Location.Y + textItem.Location.Y);
+			
+			ReportItemCollection result = Sut.Convert (section,section.Items);
+			var checkItem = result[0];
+			
+			Assert.AreEqual(checkPoint,checkItem.Location);
+		}
+			
+		
+		[Test]
+		public void Check_LocationAfterConvert ()
+		{
+				BaseSection section = new BaseSection();
+			section.Location = new Point (10,10);
+			
+			var textItem = CreateSimpeTextItem();
+			section.Items.Add(textItem);
+			
+			Point checkPoint = new Point(section.Location.X + section.Size.Width,section.Location.Y + section.Size.Height);
+			
+			ReportItemCollection result = Sut.Convert (section,section.Items);
+			
+			Assert.AreEqual(checkPoint,Sut.LocationAfterConvert);
+		}
+		
 		
 		private BaseReportItem CreateSimpeTextItem ()
 		{
 			BaseTextItem bt = new BaseTextItem();
+			bt.Location = new Point(10,10);
 			bt.Text = "MyText";
 			return bt;
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataListBuilderFixture.cs

@@ -10,6 +10,7 @@
 using System;
 using System.Drawing;
 using ICSharpCode.Reports.Core.Exporter;
+using ICSharpCode.Reports.Core.Exporter.Converter;
 using ICSharpCode.Reports.Core.Interfaces;
 using ICSharpCode.Reports.Core.Project.Interfaces;
 using ICSharpCode.Reports.Core.Test.TestHelpers;
@@ -39,6 +40,7 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 			Assert.AreEqual(0,sut.DataManager.GetNavigator.CurrentRow);
 		}
 		
+		#region Render empty ReportModel
 		
 		[Test]
 		public void PagesCollection_Should_Be_Not_Null()
@@ -50,8 +52,9 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 		}
 		
 		
+		
 		[Test]
-		public void Pagenumber_Should_Be_One()
+		public void PageNumber_Should_Be_One()
 		{
 			Sut.WritePages();
 			Assert.AreEqual(1,Sut.Pages.Count);
@@ -59,11 +62,43 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 		}
 		
 		
+		#endregion
+		
+		#region Events
+		
 		[Test]
-		public void LocPos()
+		public void SectionRenderingEvent_Should_Fire()
 		{
+			
+			bool eventFired = false;
+			Sut.SectionRendering += delegate { { eventFired = true;}};
 			Sut.WritePages();
-			Point retVal = new Point (50,50 + reportModel.ReportHeader.Size.Height);
+			Assert.IsTrue(eventFired);
+		}
+		
+		[Test]
+		public void PageCreatedEvent_Should_Fired ()
+		{
+			bool eventFired = false;
+			Sut.PageCreated += delegate { { eventFired = true;}};
+			Sut.WritePages();
+			
+			Assert.IsTrue(eventFired);
+		}
+		
+		
+	
+		#endregion
+		
+		
+		#region Location after rendering
+		
+		[Test]
+		public void Location_After_Render_Empty_Section()
+		{
+			Sut.WritePages();
+			BaseSection section = reportModel.ReportHeader;
+			Point retVal = new Point (section.Location.X + section.Size.Width,section.Location.Y + section.Size.Height);
 			Assert.AreEqual(retVal.Y,Sut.PositionAfterRenderSection.Y);
 		}
 		
@@ -87,16 +122,22 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 				Location = new Point  (5,5)
 			};
 			row.Items.Add(CreateSimpeTextItem());
+			
 			reportModel.ReportHeader.Items.Add(row);
 			Sut.WritePages();
-			Assert.AreEqual(1,Sut.Pages[0].Items.Count);
-			var checkRow = Sut.Pages[0].Items[0];
-			Assert.IsAssignableFrom(typeof(BaseRowItem),checkRow);
 			
-			BaseReportItem checkItem = ((BaseRowItem)checkRow).Items[0];
-			Assert.IsNotNull(checkItem);
+			
+			var item = Sut.Pages[0].Items[0];
+			Assert.IsAssignableFrom(typeof(BaseRowItem),item,"10");
+			Assert.AreEqual(1,((BaseRowItem)item).Items.Count,"20");
+			
+			var textItem = ((BaseRowItem)item).Items[0];
+			Assert.IsAssignableFrom(typeof(BaseTextItem),textItem,"30");
+			
 		}
 		
+		#endregion
+		
 		
 		private BaseReportItem CreateSimpeTextItem ()
 		{
@@ -113,9 +154,10 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 			IDataAccessStrategy da = new MockDataAccessStrategy (rs);
 			IDataManager dataManager = ICSharpCode.Reports.Core.DataManager.CreateInstance(rs,da);
 			
-			 reportModel = ReportModel.Create();
+			reportModel = ReportModel.Create();
+			var itemsConverter = new ItemsConverter();
 			
-			Sut = new DataExportListBuilder(reportModel,dataManager);
+			Sut = new DataExportListBuilder(reportModel,dataManager,itemsConverter);
 		}
 		
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataPageBuilderFixture.cs

@@ -48,10 +48,6 @@ namespace ICSharpCode.Reports.Core.Test.Exporter
 		}
 		
 		
-		
-		
-	
-		
 		public override void Setup()
 		{
 			reportModel = ReportModel.Create();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj

@@ -75,6 +75,7 @@
     <Compile Include="DataManager\IListDataManagerFixture.cs" />
     <Compile Include="DataManager\MockDataAccess.cs" />
     <Compile Include="DataManager\TableDataManagerFixture.cs" />
+    <Compile Include="Exporter\AbstractExportListBuilder.cs" />
     <Compile Include="Exporter\Converter\ItemsConverterFixture.cs" />
     <Compile Include="Exporter\DataPageBuilderFixture.cs" />
     <Compile Include="Exporter\DataListBuilderFixture.cs" />