Skip to content

Commit 0c4d0f0

Browse files
committed
ExpandoObject OK
1 parent d5fae9e commit 0c4d0f0

File tree

11 files changed

+344
-60
lines changed

11 files changed

+344
-60
lines changed

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,21 @@
125125
<ItemGroup>
126126
<None Include="Resources\Script0018.txt" />
127127
</ItemGroup>
128+
<ItemGroup>
129+
<None Include="Resources\Script0019.txt" />
130+
</ItemGroup>
131+
<ItemGroup>
132+
<None Include="Resources\Script0020.txt" />
133+
</ItemGroup>
134+
<ItemGroup>
135+
<None Include="Resources\Script0021.txt" />
136+
</ItemGroup>
137+
<ItemGroup>
138+
<None Include="Resources\Script0022.txt" />
139+
</ItemGroup>
140+
<ItemGroup>
141+
<None Include="Resources\Script0023.txt" />
142+
</ItemGroup>
128143
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129144
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
130145
<PropertyGroup>

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,42 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
969969

970970
#endregion
971971

972+
#region ExpandoObject
973+
974+
yield return new TestCaseData(Resources.Script0019, null, null, null)
975+
.SetCategory("Script")
976+
.SetCategory("ExpandoObject")
977+
.SetCategory("return")
978+
.Returns(58.3);
979+
yield return new TestCaseData(Resources.Script0020, null, null, null)
980+
.SetCategory("Script")
981+
.SetCategory("ExpandoObject")
982+
.SetCategory("Indexing")
983+
.SetCategory("return")
984+
.Returns(58.3);
985+
yield return new TestCaseData(Resources.Script0021, null, null, null)
986+
.SetCategory("Script")
987+
.SetCategory("ExpandoObject")
988+
.SetCategory("Indexing")
989+
.SetCategory("return")
990+
.Returns(58.3);
991+
yield return new TestCaseData(Resources.Script0022, null, null, null)
992+
.SetCategory("Script")
993+
.SetCategory("ExpandoObject")
994+
.SetCategory("Indexing")
995+
.SetCategory("return")
996+
.Returns(58.3);
997+
yield return new TestCaseData(Resources.Script0023, null, null, null)
998+
.SetCategory("Script")
999+
.SetCategory("ExpandoObject")
1000+
.SetCategory("Indexing")
1001+
.SetCategory("Postfix operator")
1002+
.SetCategory("++")
1003+
.SetCategory("return")
1004+
.Returns(5);
1005+
1006+
#endregion
1007+
9721008
#region More complex script
9731009

9741010
yield return new TestCaseData(Resources.Script0007, null, null, null)

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

Lines changed: 81 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,19 @@
172172
<data name="Script0018" type="System.Resources.ResXFileRef, System.Windows.Forms">
173173
<value>resources\script0018.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
174174
</data>
175+
<data name="Script0019" type="System.Resources.ResXFileRef, System.Windows.Forms">
176+
<value>resources\script0019.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
177+
</data>
178+
<data name="Script0020" type="System.Resources.ResXFileRef, System.Windows.Forms">
179+
<value>resources\script0020.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
180+
</data>
181+
<data name="Script0021" type="System.Resources.ResXFileRef, System.Windows.Forms">
182+
<value>resources\script0021.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
183+
</data>
184+
<data name="Script0022" type="System.Resources.ResXFileRef, System.Windows.Forms">
185+
<value>resources\script0022.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
186+
</data>
187+
<data name="Script0023" type="System.Resources.ResXFileRef, System.Windows.Forms">
188+
<value>resources\script0023.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
189+
</data>
175190
</root>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* Script0019 */
2+
myVar = new ExpandoObject();
3+
4+
myVar.X = 23.5;
5+
myVar.Y = 34.8;
6+
7+
return myVar.X + myVar.Y;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* Script0020 */
2+
myVar = new ExpandoObject();
3+
4+
myVar["X"] = 23.5;
5+
myVar["Y"] = 34.8;
6+
7+
return myVar.X + myVar.Y;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* Script0021 */
2+
myVar = new ExpandoObject();
3+
4+
myVar["X"] = 23.5;
5+
myVar["Y"] = 34.8;
6+
7+
return myVar["X"] + myVar["Y"];
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* Script0022 */
2+
myVar = new ExpandoObject();
3+
4+
myVar.X = 23.5;
5+
myVar.Y = 34.8;
6+
7+
return myVar["X"] + myVar["Y"];
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* Script0023 */
2+
myVar = new ExpandoObject();
3+
4+
myVar.X = 2;
5+
myVar.X++;
6+
myVar["Y"] = 1;
7+
myVar["Y"]++;
8+
9+
return myVar["X"] + myVar.Y;

0 commit comments

Comments
 (0)