From d328d74f6c00a614bb5e6e458cf410537646b8d4 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sun, 26 Jan 2014 20:15:00 +0100 Subject: [PATCH] Cleanup SumAggregate Fixture --- .../Expressions/Aggregates/SumAggregate.cs | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/Aggregates/SumAggregate.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/Aggregates/SumAggregate.cs index f4cd9d932f..89d784f6b7 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/Aggregates/SumAggregate.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/Aggregates/SumAggregate.cs @@ -18,49 +18,43 @@ namespace ICSharpCode.Reporting.Test.Expressions.Aggregates AggregateCollection aggregateCollection; AggregateFuctionHelper helper; CollectionDataSource dataSource; - + ExpressionVisitor visitor; [Test] public void CanSum_Int_WholeCollection() { - var reportSettings = new ReportSettings(); - var visitor = new ExpressionVisitor (reportSettings); - visitor.SetCurrentDataSource(dataSource.SortedList); var script = "= sum('intValue')"; - collection[0].Text = script; - visitor.Visit(collection[0]); - Assert.That (collection[0].Text,Is.EqualTo("406")); - Assert.That(Convert.ToInt32(collection[0].Text),Is.TypeOf(typeof(int))); + var result = Evaluate(script); + Assert.That (result.Text,Is.EqualTo("406")); + Assert.That(Convert.ToInt32(result.Text),Is.TypeOf(typeof(int))); } [Test] public void CanSum_Double_WholeCollection() { - var reportSettings = new ReportSettings(); - var visitor = new ExpressionVisitor (reportSettings); - visitor.SetCurrentDataSource(dataSource.SortedList); var script = "= sum('doubleValue')"; - collection[0].Text = script; - visitor.Visit(collection[0]); - Assert.That (collection[0].Text,Is.EqualTo("408,25")); - Assert.That(Convert.ToDouble(collection[0].Text),Is.TypeOf(typeof(double))); + var result = Evaluate(script); + Assert.That (result.Text,Is.EqualTo("408,25")); + Assert.That(Convert.ToDouble(result.Text),Is.TypeOf(typeof(double))); } [Test] public void CanSum_Double_With_String_Concat() { - var reportSettings = new ReportSettings(); - var visitor = new ExpressionVisitor (reportSettings); - visitor.SetCurrentDataSource(dataSource.SortedList); var script = "= 'myText ' + sum('doubleValue')"; + var result = Evaluate(script); + Assert.That (result.Text,Is.EqualTo("myText 408,25")); + } + + + ExportText Evaluate (string script) { collection[0].Text = script; visitor.Visit(collection[0]); - Assert.That (collection[0].Text,Is.EqualTo("myText 408,25")); + return collection[0]; } - [SetUp] public void CreateExportlist() { collection = new Collection(); @@ -73,6 +67,8 @@ namespace ICSharpCode.Reporting.Test.Expressions.Aggregates aggregateCollection = helper.AggregateCollection; dataSource = new CollectionDataSource(aggregateCollection,new ReportSettings()); dataSource.Bind(); + visitor = new ExpressionVisitor(new ReportSettings()); + visitor.SetCurrentDataSource(dataSource.SortedList); } }