Added test for evaluation

Author: nerzhulart

MonoDevelop.Debugger.Tests.TestApp/AdvancedEvaluation.cs

@@ -85,6 +85,39 @@ public async Task Bug24998 ()
 			action ();
 			someVariable.Add (someField);/*cc622137-a162-4b91-a85c-88241e68c3ea*/
 		}
+
+		
+		public void InvocationsCountDuringExpandingTest ()
+		{
+			var mutableFieldClass = new MutableFieldClass ();
+			Console.WriteLine("InvocationsCountDuringExpandingTest breakpoint");/*8865cace-6b57-42cc-ad55-68a2c12dd3d7*/
+		}
+
+		class MutableFieldClass
+		{
+			int sharedX = 0;
+
+			public MutableField Prop1
+			{
+				get { return new MutableField(sharedX++); }
+			}
+
+			public MutableField Prop2
+			{
+				get { return new MutableField(sharedX++); }
+			}
+		}
+
+
+		class MutableField
+		{
+			int x;
+
+			public MutableField(int x)
+			{
+				this.x = x;
+			}
+		}
 	}
 }
 

MonoDevelop.Debugger.Tests/AdvancedEvaluationTests.cs

@@ -150,6 +150,36 @@ public void YieldMethodTest ()
 			Assert.AreEqual (3, val.GetAllChildrenSync ().Length);
 
 		}
+
+		[Test]
+		public void InvocationsCountDuringExpandingTest ()
+		{
+			InitializeTest ();
+			AddBreakpoint ("8865cace-6b57-42cc-ad55-68a2c12dd3d7");
+			StartTest ("InvocationsCountDuringExpandingTest");
+			CheckPosition ("8865cace-6b57-42cc-ad55-68a2c12dd3d7");
+			var options = Session.EvaluationOptions.Clone ();
+			options.GroupPrivateMembers = false; // to access private fields (else there are in Private subgroup)
+			var value = Eval ("mutableFieldClass");
+			var sharedX = value.GetChildSync ("sharedX", options);
+			Assert.NotNull (sharedX);
+
+			var prop1 = value.GetChildSync("Prop1", options);
+			Assert.NotNull (prop1);
+			Assert.AreEqual ("MonoDevelop.Debugger.Tests.TestApp.AdvancedEvaluation.MutableField", prop1.TypeName);
+			var prop1X = prop1.GetChildSync ("x", options);
+			Assert.NotNull (prop1X);
+			Assert.AreEqual ("0", prop1X.Value); // before CorValRef optimization this field evaluated to 2,
+			// because every value to the root object was recalculated - this was wrong behavior
+
+			var prop2 = value.GetChildSync ("Prop2", options);
+			Assert.NotNull (prop2);
+			var prop2X = prop2.GetChildSync("x", options);
+			Assert.NotNull (prop2X);
+			Assert.AreEqual ("1", prop2X.Value);
+
+			Assert.AreEqual ("2", sharedX.Value);
+		}
 	}
 }