Skip to content

Commit 86fb575

Browse files
authored
Merge pull request #66 from codingseb/dev
Dev
2 parents e041541 + 5d16cd6 commit 86fb575

File tree

4 files changed

+155
-73
lines changed

4 files changed

+155
-73
lines changed

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
18741874

18751875
#endregion
18761876

1877-
#region inherits ExpressionEvaluator
1877+
#region Inherits ExpressionEvaluator
18781878

18791879
#region Redefine existing operators
18801880

@@ -2082,14 +2082,44 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
20822082

20832083
#endregion
20842084

2085-
#region bug resolution
2085+
#region Bug resolution
20862086

20872087
yield return new TestCaseData(new ExpressionEvaluator()
20882088
, "(new List<Regex>()).GetType()"
20892089
, null)
20902090
.Returns(typeof(List<Regex>))
20912091
.SetCategory("Bug resolution");
20922092

2093+
// For bug #65
2094+
var Persons = new List<Person2>() { new Person2() { Code = "QT00010", Name = "Pedrito", Number = 11.11m },
2095+
new Person2() { Code = "QT00011", Name = "Pablito", Number = 12.11m }};
2096+
2097+
yield return new TestCaseData(new ExpressionEvaluator() { Context = new { Persons } }
2098+
, "Persons.Sum(x=>x.Number)"
2099+
, null)
2100+
.Returns(23.22m)
2101+
.SetCategory("Bug resolution");
2102+
2103+
yield return new TestCaseData(new ExpressionEvaluator() { Context = new { Persons } }
2104+
, "Persons.Average(x=>x.Number)"
2105+
, null)
2106+
.Returns(11.61m)
2107+
.SetCategory("Bug resolution");
2108+
2109+
yield return new TestCaseData(new ExpressionEvaluator() { Context = new { Persons } }
2110+
, "Persons.Max(x=>x.Number)"
2111+
, null)
2112+
.Returns(12.11m)
2113+
.SetCategory("Bug resolution");
2114+
2115+
yield return new TestCaseData(new ExpressionEvaluator() { Context = new { Persons } }
2116+
, "Persons.Min(x=>x.Number)"
2117+
, null)
2118+
.Returns(11.11m)
2119+
.SetCategory("Bug resolution");
2120+
2121+
// end of bug #65
2122+
20932123
#endregion
20942124
}
20952125
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace CodingSeb.ExpressionEvaluator.Tests
2+
{
3+
/// <summary>
4+
/// class to test specific bug #65 (When multiple implementation of method with lambda argument)
5+
/// </summary>
6+
public class Person2
7+
{
8+
public string Code { get; set; }
9+
public string Name { get; set; }
10+
public decimal Number { get; set; }
11+
}
12+
}

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Product>CodingSeb.ExpressionEvaluator</Product>
66
<Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
77
<Copyright>Copyright © Coding Seb 2017</Copyright>
8-
<Version>1.4.14.0</Version>
9-
<AssemblyVersion>1.4.14.0</AssemblyVersion>
10-
<FileVersion>1.4.14.0</FileVersion>
8+
<Version>1.4.15.0</Version>
9+
<AssemblyVersion>1.4.15.0</AssemblyVersion>
10+
<FileVersion>1.4.15.0</FileVersion>
1111
<OutputPath>bin\$(Configuration)\</OutputPath>
1212
<Authors>Coding Seb</Authors>
1313
<PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -18,7 +18,7 @@
1818
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1919
<PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
2020
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
21-
<PackageReleaseNotes>* Support for Unicode naming (variables, types, methods...) to support coding in languages like (Chinese, Korean, Japenese...)</PackageReleaseNotes>
21+
<PackageReleaseNotes>* Add a Hack to better manage overloaded Linq methods define in Enumerable (Sum, Average, Min and Max...)</PackageReleaseNotes>
2222
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
2323
<RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
2424
</PropertyGroup>

0 commit comments

Comments
 (0)