Browse Source

Fix Expression UnitTest's

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6295 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 15 years ago
parent
commit
c53b1946ae
  1. 17
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs
  2. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs
  3. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs
  4. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs

17
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@ -111,7 +111,7 @@ namespace ICSharpCode.Reports.Core{ @@ -111,7 +111,7 @@ namespace ICSharpCode.Reports.Core{
private BaseReportItem InnerFind (string name)
{
return this.FirstOrDefault(x => x.Name == name);
return this.FirstOrDefault(x => 0 == String.Compare(x.Name, name,true));
}
@ -188,7 +188,8 @@ namespace ICSharpCode.Reports.Core{ @@ -188,7 +188,8 @@ namespace ICSharpCode.Reports.Core{
if (String.IsNullOrEmpty(columnName)) {
throw new ArgumentNullException("columnName");
}
return this.FirstOrDefault(x => x.ColumnName == columnName);
return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
}
}
[Serializable()]
@ -203,7 +204,8 @@ namespace ICSharpCode.Reports.Core{ @@ -203,7 +204,8 @@ namespace ICSharpCode.Reports.Core{
if (String.IsNullOrEmpty(columnName)) {
throw new ArgumentNullException("columnName");
}
return this.FirstOrDefault(x => x.ColumnName == columnName);
return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
}
@ -239,7 +241,8 @@ namespace ICSharpCode.Reports.Core{ @@ -239,7 +241,8 @@ namespace ICSharpCode.Reports.Core{
if (String.IsNullOrEmpty(columnName)) {
throw new ArgumentNullException("columnName");
}
return this.FirstOrDefault(x => x.ColumnName == columnName);
return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
}
@ -275,7 +278,8 @@ namespace ICSharpCode.Reports.Core{ @@ -275,7 +278,8 @@ namespace ICSharpCode.Reports.Core{
if (String.IsNullOrEmpty(parameterName)) {
throw new ArgumentNullException("parameterName");
}
return this.FirstOrDefault(x => x.ParameterName == parameterName);
return this.FirstOrDefault(x => 0 == String.Compare(x.ParameterName,parameterName,true));
}
@ -342,7 +346,8 @@ namespace ICSharpCode.Reports.Core{ @@ -342,7 +346,8 @@ namespace ICSharpCode.Reports.Core{
if (String.IsNullOrEmpty(columnName)) {
throw new ArgumentNullException("columnName");
}
return this.FirstOrDefault(x => x.ColumnName == columnName);
return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
}
}
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs

@ -19,7 +19,7 @@ using System.Xml; @@ -19,7 +19,7 @@ using System.Xml;
namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests
{
[TestFixture]
[Ignore]
[SetCulture("de-DE")]
public class AggregateFunctionsFromTableFixture
{

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs

@ -17,7 +17,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests @@ -17,7 +17,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests
{
[TestFixture]
[SetCulture("de-DE")]
[Ignore]
public class AggregateFunctionsFromIListFixture
{
private IExpressionEvaluatorFacade evaluator;

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs

@ -62,11 +62,11 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests @@ -62,11 +62,11 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests
[Test]
[Ignore]
// [Ignore]
public void Unkown_ColumnName ()
{
const string expression = "=Fields!Unknown";
Assert.That(this.evaluator.Evaluate(expression), Is.EqualTo("Name"));
Assert.That(this.evaluator.Evaluate(expression), Is.EqualTo("Unknown"));
}

Loading…
Cancel
Save