Still some bugs with structs

Author: codingseb

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

@@ -21,6 +21,9 @@
     <Compile Update="TestsUtils\StructForTest1.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="TestsUtils\StructForTest2.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CodingSeb.ExpressionEvaluator\CodingSeb.ExpressionEvaluator.csproj" />

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -1319,16 +1319,23 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
 
                 yield return new TestCaseData("return myStruct.myIntvalue;", evaluatorForStructs, null, null)
                     .SetCategory("Script")
-                    .SetCategory("struct value")
+                    .SetCategory("struct tests")
                     .SetCategory("Bug")
                     .Returns(0);               
 
-                yield return new TestCaseData("myStruct.myIntvalue = 3;\r\nmyStruct.myStringValue = \"Test\";"
-                        , new ExpressionEvaluator(new Dictionary<string, object> { { "myStruct", new StructForTest1() } }), null, null)
+                yield return new TestCaseData(Resources.Script0054, evaluatorForStructs, null, null)
                     .SetCategory("Script")
-                    .SetCategory("struct value assignation")
+                    .SetCategory("struct tests")
                     .SetCategory("Bug")
-                    .Returns(0);
+                    .Returns("Result Test 3");
+
+                evaluatorForStructs.Variables["otherStruct"] = new StructForTest2();
+
+                yield return new TestCaseData(Resources.Script0055, evaluatorForStructs, null, null)
+                    .SetCategory("Script")
+                    .SetCategory("struct tests")
+                    .SetCategory("Bug")
+                    .Returns("Result Hey 9, 5");
 
                 #endregion
             }

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -277,4 +277,10 @@
   <data name="Script0053" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0053.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Script0054" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0054.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="Script0055" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0055.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -1,4 +1,4 @@
-/* Script0051 */
+/* Script0053 */
 x = new 
 {
 	Hello = 3,

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0053.txt

@@ -0,0 +1,5 @@
+/* Script0054 */
+myStruct.myIntvalue = 3;
+myStruct.myStringValue = "Test";
+
+return $"Result {myStruct.myStringValue} {myStruct.myIntvalue}";

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0054.txt

@@ -0,0 +1,11 @@
+/* Script0055 */
+otherStruct.AnOtherIntValue = 5;
+otherStruct.struct1 = new StructForTest1()
+{ 
+	myIntvalue = 8, 
+	myStringValue = "Hey"
+};
+
+otherStruct.struct1.myIntvalue = 9;
+
+return $"Result {otherStruct.struct1.myStringValue} {otherStruct.struct1.myIntvalue}, {otherStruct.AnOtherIntValue}";

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0055.txt

@@ -0,0 +1,8 @@
+namespace CodingSeb.ExpressionEvaluator.Tests
+{
+    public struct StructForTest2
+    {
+        public int AnOtherIntValue;
+        public StructForTest1 struct1;
+    }
+}