Rework Fields!Fieldname

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/Ast/FieldsNode.cs

@@ -24,12 +24,13 @@ namespace ICSharpCode.Reporting.Expressions.Irony.Ast
 			fieldNode = AddChild("Args", nodes[2]);
 		}
 		
+		
 		protected override object DoEvaluate(ScriptThread thread)
 		{
 			thread.CurrentNode = this;  //standard prolog
-			var c = thread.GetCurrentContainer();
+			var container = thread.GetCurrentContainer();
-			var cc = (ExportText)c.ExportedItems.Where(x => x.Name == fieldNode.AsString).FirstOrDefault();
+			var column = (ExportText)container.ExportedItems.Where(x => x.Name == fieldNode.AsString).FirstOrDefault();
-			return	cc.Text;
+			return	column.Text;
 		}
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/ICSharpCode.Reporting.Test.csproj

@@ -66,7 +66,9 @@
   <ItemGroup>
     <Compile Include="src\DataSource\ContributorsList.cs" />
     <Compile Include="src\DataSource\CollectionHandlingFixture.cs" />
-    <Compile Include="src\Expressions\IntegrationTests.cs" />
+    <Compile Include="src\Expressions\InterationTests\FieldsFixture.cs" />
+    <Compile Include="src\Expressions\InterationTests\StandardTests.cs" />
+    <Compile Include="src\Expressions\InterationTests\ParametersFixture.cs" />
     <Compile Include="src\Expressions\IronyGeneral.cs" />
     <Compile Include="src\Expressions\ParametersHandlingFixture.cs" />
     <Compile Include="src\MeasureArrange\ContainerArrangeStrategyFixture.cs" />
@@ -88,6 +90,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="src" />
+    <Folder Include="src\Expressions\InterationTests" />
     <Folder Include="src\Model" />
     <Folder Include="src\DataSource" />
     <Folder Include="src\MeasureArrange" />

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/IntegrationTests.cs

@@ -1,170 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-using System;
-using System.Collections.ObjectModel;
-using ICSharpCode.Reporting.BaseClasses;
-using ICSharpCode.Reporting.Exporter.Visitors;
-using ICSharpCode.Reporting.Items;
-using ICSharpCode.Reporting.PageBuilder.ExportColumns;
-using NUnit.Framework;
-
-namespace ICSharpCode.Reporting.Test.Expressions
-{
-	[TestFixture]
-	public class IntegrationTests
-	{
-		Collection<ExportText> collection;
-		ExpressionVisitor expressionVisitor;
-		
-		[Test]
-		public void ExpressionMustStartWithEqualChar()
-		{
-			collection[0].Text = "myText";
-			var result = collection[0].Text;
-			expressionVisitor.Visit(collection[0]);
-			Assert.That(result,Is.EqualTo(collection[0].Text));
-		}
-		
-		
-		[Test]
-		public void ReportSyntaxError() {
-			collection[0].Text = "= myText";
-			expressionVisitor.Visit(collection[0]);
-		}
-		
-		
-		
-		[Test]
-		public void SimpleStringHandling () {
-			var script = "='Sharpdevelop' + ' is great'";
-			collection[0].Text = script;
-			expressionVisitor.Visit(collection[0]);
-			Assert.That(collection[0].Text,Is.EqualTo("Sharpdevelop is great"));
-		}
-		
-		#region System.Environment
-		
-		[Test]
-		[Ignore]
-		public void CanUserSystemEnvironment() {
-			/*
-			//Using methods imported from System.Environment
-			var script = @"report = '#{MachineName}-#{OSVersion}-#{UserName}'";
-			var result = evaluator.Evaluate(script);
-			var expected = string.Format("{0}-{1}-{2}", Environment.MachineName, Environment.OSVersion, Environment.UserName);
-			Assert.AreEqual(expected, result, "Unexpected computation result");
-			*/
-		}
-		
-		#endregion
-		
-		
-		#region Convert inside Container
-		[Test]
-		public void SimpleStringHandlingInContainer () {
-			var script = "='Sharpdevelop' + ' is great'";
-			
-			collection[0].Text = script;
-			var exportContainer = new ExportContainer();
-			exportContainer.ExportedItems.Add(collection[0]);
-			expressionVisitor.Visit(exportContainer);
-			
-			var resultColumn = (ExportText)exportContainer.ExportedItems[0];
-			Assert.That(resultColumn.Text,Is.EqualTo("Sharpdevelop is great"));
-		}
-		
-		#endregion
-		
-		#region System.Math
-		
-		[Test]
-		public void CanRunSystemMath () {
-			//Using methods imported from System.Math class
-			var script = @"=abs(-1.0) + Log10(100.0) + sqrt(9) + floor(4.5) + sin(PI/2)";
-			collection[0].Text = script;
-			expressionVisitor.Visit(collection[0]);
-			var res = Convert.ToDouble(collection[0].Text);
-			Assert.That(collection[0].Text,Is.EqualTo("11"));		
-		}
-		#endregion
-		
-		
-		#region Parameters
-		
-		[Test]
-		public void CanConcatParameter () {
-			
-			var parameters = new ParameterCollection();
-			parameters.Add(new BasicParameter() {
-			               	ParameterName = "param1",
-			               	ParameterValue = "SharpDevelop"
-			               }
-			              );
-			
-			parameters.Add(new BasicParameter() {
-			               	ParameterName = "param2",
-			               	ParameterValue = " is "
-			               }
-			              );
-			parameters.Add(new BasicParameter() {
-			               	ParameterName = "param3",
-			               	ParameterValue = "great"
-			               }
-			              );
-			
-			var reportSettings = CreateReportSettings(parameters);
-			var visitor = new ExpressionVisitor(reportSettings);
-			
-			var script = "=Parameters!param1 + Parameters!param2 + Parameters!param3";
-			collection[0].Text = script;
-			visitor.Visit(collection[0]);
-			Assert.That (collection[0].Text,Is.EqualTo("SharpDevelop is great"));
-		}
-		
-		
-		#endregion
-		
-		#region Fields
-		
-		[Test]
-		public void fields() {
-			var script = "=Fields!myfield";
-			collection[0].Text = script;
-			collection.Add(new ExportText() 
-			               {
-			               	Text = "hi from Field",
-			               	Name = "myfield"
-			               });
-			               
-			var visitor = new ExpressionVisitor(new ReportSettings());
-			var exportContainer = new ExportContainer();
-			exportContainer.ExportedItems.Add(collection[0]);
-			exportContainer.ExportedItems.Add(collection[1]);
-			visitor.Visit(exportContainer);	
-			Assert.That (collection[0].Text,Is.EqualTo("hi from Field"));
-		}
-		#endregion
-		ReportSettings CreateReportSettings(ParameterCollection parameters)
-		{
-			var reportSettings = new ReportSettings();
-			reportSettings.ParameterCollection.AddRange(parameters);		
-			return reportSettings;
-		}
-		
-		
-		[SetUp]
-		public void CreateExportlist() {
-		collection = new Collection<ExportText>();
-			collection.Add(new ExportText()
-			       {
-			       	 Text = "myExporttextColumn"
-			       });
-		}
-			
-		[TestFixtureSetUp]
-		public void Setup() {
-			expressionVisitor = new ExpressionVisitor(new ReportSettings());
-		}
-		 
-	}
-}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/InterationTests/FieldsFixture.cs

@@ -0,0 +1,59 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+using System;
+using System.Collections.ObjectModel;
+using ICSharpCode.Reporting.Exporter.Visitors;
+using ICSharpCode.Reporting.Items;
+using ICSharpCode.Reporting.PageBuilder.ExportColumns;
+using NUnit.Framework;
+
+namespace ICSharpCode.Reporting.Test.Expressions.InterationTests
+{
+	[TestFixture]
+	public class FieldsFixture
+	{
+		Collection<ExportText> collection;
+		ExpressionVisitor expressionVisitor;
+		
+		
+		[Test]
+		public void FieldsInContainer() {
+			var script = "=Fields!myfield1 + Fields!myfield2";
+			collection[0].Text = script;
+			collection.Add(new ExportText() 
+			               {
+			               	Text = "Sharpdevelop",
+			               	Name = "myfield1"
+			               });
+			collection.Add(new ExportText() 
+			               {
+			               	Text = " is great",
+			               	Name = "myfield2"
+			               });               
+			var visitor = new ExpressionVisitor(new ReportSettings());
+			var exportContainer = new ExportContainer();
+			exportContainer.ExportedItems.Add(collection[0]);
+			exportContainer.ExportedItems.Add(collection[1]);
+			exportContainer.ExportedItems.Add(collection[2]);
+			visitor.Visit(exportContainer);	
+			Assert.That (collection[0].Text,Is.EqualTo("Sharpdevelop is great"));
+		}
+		
+		
+		[SetUp]
+		public void CreateExportlist() {
+		collection = new Collection<ExportText>();
+			collection.Add(new ExportText()
+			       {
+			       	 Text = "myExporttextColumn"
+			       });
+		}
+		
+		[TestFixtureSetUp]
+		public void Setup() {
+			expressionVisitor = new ExpressionVisitor(new ReportSettings());
+		}
+		
+		
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/InterationTests/ParametersFixture.cs

@@ -0,0 +1,73 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+using System;
+using System.Collections.ObjectModel;
+using ICSharpCode.Reporting.BaseClasses;
+using ICSharpCode.Reporting.Exporter.Visitors;
+using ICSharpCode.Reporting.Items;
+using ICSharpCode.Reporting.PageBuilder.ExportColumns;
+using NUnit.Framework;
+
+namespace ICSharpCode.Reporting.Test.Expressions.InterationTests
+{
+	[TestFixture]
+	public class ParametersFixture
+	{
+		Collection<ExportText> collection;
+		ExpressionVisitor expressionVisitor;
+		
+		
+		[Test]
+		public void CanConcatParameter () {
+			
+			var parameters = new ParameterCollection();
+			parameters.Add(new BasicParameter() {
+			               	ParameterName = "param1",
+			               	ParameterValue = "SharpDevelop"
+			               }
+			              );
+			
+			parameters.Add(new BasicParameter() {
+			               	ParameterName = "param2",
+			               	ParameterValue = " is "
+			               }
+			              );
+			parameters.Add(new BasicParameter() {
+			               	ParameterName = "param3",
+			               	ParameterValue = "great"
+			               }
+			              );
+			
+			var reportSettings = CreateReportSettings(parameters);
+			var visitor = new ExpressionVisitor(reportSettings);
+			
+			var script = "=Parameters!param1 + Parameters!param2 + Parameters!param3";
+			collection[0].Text = script;
+			visitor.Visit(collection[0]);
+			Assert.That (collection[0].Text,Is.EqualTo("SharpDevelop is great"));
+		}
+		
+		
+		ReportSettings CreateReportSettings(ParameterCollection parameters)
+		{
+			var reportSettings = new ReportSettings();
+			reportSettings.ParameterCollection.AddRange(parameters);		
+			return reportSettings;
+		}
+		
+		
+		[SetUp]
+		public void CreateExportlist() {
+		collection = new Collection<ExportText>();
+			collection.Add(new ExportText()
+			       {
+			       	 Text = "myExporttextColumn"
+			       });
+		}
+			
+		[TestFixtureSetUp]
+		public void Setup() {
+			expressionVisitor = new ExpressionVisitor(new ReportSettings());
+		}
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/InterationTests/StandardTests.cs

@@ -0,0 +1,93 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+using System;
+using System.Collections.ObjectModel;
+using ICSharpCode.Reporting.BaseClasses;
+using ICSharpCode.Reporting.Exporter.Visitors;
+using ICSharpCode.Reporting.Items;
+using ICSharpCode.Reporting.PageBuilder.ExportColumns;
+using NUnit.Framework;
+
+namespace ICSharpCode.Reporting.Test.Expressions.InterationTests {
+	
+	[TestFixture]
+	public class StandardTests
+	{
+		Collection<ExportText> collection;
+		ExpressionVisitor expressionVisitor;
+		
+		[Test]
+		public void ExpressionMustStartWithEqualChar()
+		{
+			collection[0].Text = "myText";
+			var result = collection[0].Text;
+			expressionVisitor.Visit(collection[0]);
+			Assert.That(result,Is.EqualTo(collection[0].Text));
+		}
+		
+		
+		[Test]
+		public void ReportSyntaxError() {
+			collection[0].Text = "= myText";
+			expressionVisitor.Visit(collection[0]);
+		}
+		
+		
+		
+		[Test]
+		public void SimpleStringHandling () {
+			var script = "='Sharpdevelop' + ' is great'";
+			collection[0].Text = script;
+			expressionVisitor.Visit(collection[0]);
+			Assert.That(collection[0].Text,Is.EqualTo("Sharpdevelop is great"));
+		}
+		
+		
+		#region Convert inside Container
+		[Test]
+		public void SimpleStringHandlingInContainer () {
+			var script = "='Sharpdevelop' + ' is great'";
+			
+			collection[0].Text = script;
+			var exportContainer = new ExportContainer();
+			exportContainer.ExportedItems.Add(collection[0]);
+			expressionVisitor.Visit(exportContainer);
+			
+			var resultColumn = (ExportText)exportContainer.ExportedItems[0];
+			Assert.That(resultColumn.Text,Is.EqualTo("Sharpdevelop is great"));
+		}
+		
+		#endregion
+		
+		
+		#region System.Math
+		
+		[Test]
+		public void CanRunSystemMath () {
+			//Using methods imported from System.Math class
+			var script = @"=abs(-1.0) + Log10(100.0) + sqrt(9) + floor(4.5) + sin(PI/2)";
+			collection[0].Text = script;
+			expressionVisitor.Visit(collection[0]);
+			var res = Convert.ToDouble(collection[0].Text);
+			Assert.That(collection[0].Text,Is.EqualTo("11"));		
+		}
+		#endregion
+		
+		
+		[SetUp]
+		public void CreateExportlist() {
+		collection = new Collection<ExportText>();
+			collection.Add(new ExportText()
+			       {
+			       	 Text = "myExporttextColumn"
+			       });
+		}
+			
+		
+		[TestFixtureSetUp]
+		public void Setup() {
+			expressionVisitor = new ExpressionVisitor(new ReportSettings());
+		}
+		 
+	}
+}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Test/ICSharpCode.Reporting.Test/src/Expressions/ParametersHandlingFixture.cs

@@ -92,7 +92,6 @@ namespace ICSharpCode.Reporting.Test.Expressions
 		{
 			var reportSettings = new ReportSettings();
 			reportSettings.ParameterCollection.AddRange(parameters);
-//			evaluator.App.Globals.Add("ReportSettings", reportSettings);
 			evaluator.AddReportSettings(reportSettings);
 		}