From 03a4e7c58949ed5eaabd7651cdef0c14fc2ec228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Srbeck=C3=BD?= <dsrbecky@gmail.com>
Date: Wed, 16 Jan 2008 12:03:07 +0000
Subject: [PATCH] Tests output - use name of dumped object as the XML node
 name.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2857 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/Src/DebuggerTestsBase.cs          |  8 ++---
 .../Project/Src/TestPrograms/ArrayValue.cs    |  8 ++---
 .../Project/Src/TestPrograms/Callstack.cs     | 12 +++----
 .../TestPrograms/FunctionArgumentVariables.cs | 20 ++++++------
 .../Src/TestPrograms/FunctionLifetime.cs      | 32 +++++++++----------
 .../TestPrograms/FunctionLocalVariables.cs    |  4 +--
 .../Project/Src/TestPrograms/Generics.cs      | 32 +++++++++----------
 .../Project/Src/TestPrograms/Stepping.cs      | 18 +++++------
 .../Project/Src/TestPrograms/ValueType.cs     |  4 +--
 9 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
index 079eca6d86..478777ded5 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
@@ -158,21 +158,19 @@ namespace Debugger.Tests
 		
 		public void ObjectDump(object obj)
 		{
-			ObjectDump(null, obj);
+			ObjectDump("Object", obj);
 		}
 		
 		public void ObjectDump(string name, object obj)
 		{
-			XmlElement dumpNode = testDoc.CreateElement("Object");
-			if (name != null) dumpNode.SetAttribute("name", name);
+			XmlElement dumpNode = testDoc.CreateElement(XmlConvert.EncodeName(name.Replace(" ", "_")));
 			testNode.AppendChild(dumpNode);
 			Serialize(dumpNode, obj, 16, new List<object>());
 		}
 		
 		public void ObjectDumpToString(string name, object obj)
 		{
-			XmlElement dumpNode = testDoc.CreateElement("Object");
-			if (name != null) dumpNode.SetAttribute("name", name);
+			XmlElement dumpNode = testDoc.CreateElement(XmlConvert.EncodeName(name.Replace(" ", "_")));
 			testNode.AppendChild(dumpNode);
 			if (obj == null) {
 				dumpNode.AppendChild(dumpNode.OwnerDocument.CreateTextNode("null"));
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
index d108b4b2ac..efdcad8b6c 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs
@@ -51,7 +51,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">ArrayValue.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="array" Type="Value" ToString="array = {System.Int32[]}">
+    <array Type="Value" ToString="array = {System.Int32[]}">
       <IsArray>True</IsArray>
       <ArrayLenght>5</ArrayLenght>
       <ArrayRank>1</ArrayRank>
@@ -66,8 +66,8 @@ namespace Debugger.Tests {
       <AsString>{System.Int32[]}</AsString>
       <HasExpired>False</HasExpired>
       <Type>System.Int32[]</Type>
-    </Object>
-    <Object name="array elements" Type="ValueCollection" ToString="[ValueCollection Count=5]">
+    </array>
+    <array_elements Type="ValueCollection" ToString="[ValueCollection Count=5]">
       <Count>5</Count>
       <Item Type="Value" ToString="array[0] = 0">
         <IsArray>False</IsArray>
@@ -149,7 +149,7 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.Int32</Type>
       </Item>
-    </Object>
+    </array_elements>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
index ec5992f4b3..80ab483cda 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Callstack.cs
@@ -63,7 +63,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">Callstack.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Callstack" Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
+    <Callstack Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
       <Count>3</Count>
       <Item Type="StackFrame" ToString="Debugger.Tests.TestPrograms.Callstack.Sub2">
         <MethodInfo>Sub2</MethodInfo>
@@ -98,9 +98,9 @@ namespace Debugger.Tests {
         <Arguments>[ValueCollection Count=0]</Arguments>
         <LocalVariables>[ValueCollection Count=0]</LocalVariables>
       </Item>
-    </Object>
+    </Callstack>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="Callstack" Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
+    <Callstack Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
       <Count>2</Count>
       <Item Type="StackFrame" ToString="Debugger.Tests.TestPrograms.Callstack.Sub1">
         <MethodInfo>Sub1</MethodInfo>
@@ -124,9 +124,9 @@ namespace Debugger.Tests {
         <Arguments>[ValueCollection Count=0]</Arguments>
         <LocalVariables>[ValueCollection Count=0]</LocalVariables>
       </Item>
-    </Object>
+    </Callstack>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="Callstack" Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
+    <Callstack Type="ReadOnlyCollection`1" ToString="System.Collections.ObjectModel.ReadOnlyCollection`1[Debugger.StackFrame]">
       <Count>1</Count>
       <Item Type="StackFrame" ToString="Debugger.Tests.TestPrograms.Callstack.Main">
         <MethodInfo>Main</MethodInfo>
@@ -139,7 +139,7 @@ namespace Debugger.Tests {
         <Arguments>[ValueCollection Count=0]</Arguments>
         <LocalVariables>[ValueCollection Count=0]</LocalVariables>
       </Item>
-    </Object>
+    </Callstack>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
index cb4b7397ce..282d566b3e 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs
@@ -97,7 +97,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="True">FunctionArgumentVariables.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Arguments" Type="ValueCollection" ToString="[ValueCollection Count=9]">
+    <Arguments Type="ValueCollection" ToString="[ValueCollection Count=9]">
       <Count>9</Count>
       <Item Type="Value" ToString="i = 1">
         <IsArray>False</IsArray>
@@ -243,9 +243,9 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.Nullable&lt;System.Int32&gt;</Type>
       </Item>
-    </Object>
+    </Arguments>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Arguments" Type="ValueCollection" ToString="[ValueCollection Count=1]">
+    <Arguments Type="ValueCollection" ToString="[ValueCollection Count=1]">
       <Count>1</Count>
       <Item Type="Value" ToString="args = {System.String[]}">
         <IsArray>True</IsArray>
@@ -263,9 +263,9 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.String[]</Type>
       </Item>
-    </Object>
+    </Arguments>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Arguments" Type="ValueCollection" ToString="[ValueCollection Count=1]">
+    <Arguments Type="ValueCollection" ToString="[ValueCollection Count=1]">
       <Count>1</Count>
       <Item Type="Value" ToString="args = {System.String[]}">
         <IsArray>True</IsArray>
@@ -283,9 +283,9 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.String[]</Type>
       </Item>
-    </Object>
+    </Arguments>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Arguments" Type="ValueCollection" ToString="[ValueCollection Count=1]">
+    <Arguments Type="ValueCollection" ToString="[ValueCollection Count=1]">
       <Count>1</Count>
       <Item Type="Value" ToString="args = {System.String[]}">
         <IsArray>True</IsArray>
@@ -303,9 +303,9 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.String[]</Type>
       </Item>
-    </Object>
+    </Arguments>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Arguments" Type="ValueCollection" ToString="[ValueCollection Count=2]">
+    <Arguments Type="ValueCollection" ToString="[ValueCollection Count=2]">
       <Count>2</Count>
       <Item Type="Value" ToString="i = 1">
         <IsArray>False</IsArray>
@@ -339,7 +339,7 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.String</Type>
       </Item>
-    </Object>
+    </Arguments>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
index 9860677d5d..689735877a 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLifetime.cs
@@ -75,7 +75,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">FunctionLifetime.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
       <MethodInfo>Function</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>False</HasExpired>
@@ -85,9 +85,9 @@ namespace Debugger.Tests {
       <ArgumentCount>1</ArgumentCount>
       <Arguments>[ValueCollection Count=1]</Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Old StackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
+    <Old_StackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
       <MethodInfo>Function</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>True</HasExpired>
@@ -97,8 +97,8 @@ namespace Debugger.Tests {
       <ArgumentCount exception="StackFrame has expired" />
       <Arguments exception="StackFrame has expired" />
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.SubFunction">
+    </Old_StackFrame>
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.SubFunction">
       <MethodInfo>SubFunction</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>False</HasExpired>
@@ -108,9 +108,9 @@ namespace Debugger.Tests {
       <ArgumentCount>0</ArgumentCount>
       <Arguments>[ValueCollection Count=0]</Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Old StackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
+    <Old_StackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
       <MethodInfo>Function</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>True</HasExpired>
@@ -120,8 +120,8 @@ namespace Debugger.Tests {
       <ArgumentCount exception="StackFrame has expired" />
       <Arguments exception="StackFrame has expired" />
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
+    </Old_StackFrame>
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
       <MethodInfo>Function</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>False</HasExpired>
@@ -131,9 +131,9 @@ namespace Debugger.Tests {
       <ArgumentCount>1</ArgumentCount>
       <Arguments>[ValueCollection Count=1]</Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="Main" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Main">
+    <Main Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Main">
       <MethodInfo>Main</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>False</HasExpired>
@@ -143,8 +143,8 @@ namespace Debugger.Tests {
       <ArgumentCount>0</ArgumentCount>
       <Arguments>[ValueCollection Count=0]</Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
-    <Object name="Old StackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
+    </Main>
+    <Old_StackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Function">
       <MethodInfo>Function</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>True</HasExpired>
@@ -154,8 +154,8 @@ namespace Debugger.Tests {
       <ArgumentCount exception="StackFrame has expired" />
       <Arguments exception="StackFrame has expired" />
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Main">
+    </Old_StackFrame>
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.FunctionLifetime.Main">
       <MethodInfo>Main</MethodInfo>
       <HasSymbols>True</HasSymbols>
       <HasExpired>False</HasExpired>
@@ -165,7 +165,7 @@ namespace Debugger.Tests {
       <ArgumentCount>0</ArgumentCount>
       <Arguments>[ValueCollection Count=0]</Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
index db846a5bce..963e86d32a 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionLocalVariables.cs
@@ -50,7 +50,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">FunctionLocalVariables.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="LocalVariables" Type="ValueCollection" ToString="[ValueCollection Count=5]">
+    <LocalVariables Type="ValueCollection" ToString="[ValueCollection Count=5]">
       <Count>5</Count>
       <Item Type="Value" ToString="i = 0">
         <IsArray>False</IsArray>
@@ -132,7 +132,7 @@ namespace Debugger.Tests {
         <HasExpired>False</HasExpired>
         <Type>System.Object</Type>
       </Item>
-    </Object>
+    </LocalVariables>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
index 6491bf3265..42ab3c7f08 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Generics.cs
@@ -121,7 +121,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">Generics.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.Metod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.Metod">
       <MethodInfo Type="MethodInfo" ToString="Metod">
         <Name>Metod</Name>
         <IsPrivate>False</IsPrivate>
@@ -186,9 +186,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.GenericMethod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.GenericMethod">
       <MethodInfo Type="MethodInfo" ToString="GenericMethod">
         <Name>GenericMethod</Name>
         <IsPrivate>False</IsPrivate>
@@ -253,9 +253,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticMetod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticMetod">
       <MethodInfo Type="MethodInfo" ToString="StaticMetod">
         <Name>StaticMetod</Name>
         <IsPrivate>False</IsPrivate>
@@ -320,9 +320,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticGenericMethod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;.StaticGenericMethod">
       <MethodInfo Type="MethodInfo" ToString="StaticGenericMethod">
         <Name>StaticGenericMethod</Name>
         <IsPrivate>False</IsPrivate>
@@ -387,9 +387,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.Metod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.Metod">
       <MethodInfo Type="MethodInfo" ToString="Metod">
         <Name>Metod</Name>
         <IsPrivate>False</IsPrivate>
@@ -454,9 +454,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.GenericMethod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.GenericMethod">
       <MethodInfo Type="MethodInfo" ToString="GenericMethod">
         <Name>GenericMethod</Name>
         <IsPrivate>False</IsPrivate>
@@ -521,9 +521,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticMetod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticMetod">
       <MethodInfo Type="MethodInfo" ToString="StaticMetod">
         <Name>StaticMetod</Name>
         <IsPrivate>False</IsPrivate>
@@ -588,9 +588,9 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="SelectedStackFrame" Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticGenericMethod">
+    <SelectedStackFrame Type="StackFrame" ToString="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;.StaticGenericMethod">
       <MethodInfo Type="MethodInfo" ToString="StaticGenericMethod">
         <Name>StaticGenericMethod</Name>
         <IsPrivate>False</IsPrivate>
@@ -655,7 +655,7 @@ namespace Debugger.Tests {
         </Item>
       </Arguments>
       <LocalVariables>[ValueCollection Count=0]</LocalVariables>
-    </Object>
+    </SelectedStackFrame>
     <DebuggingPaused>Break</DebuggingPaused>
     <ProcessExited />
   </Test>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
index a07217176e..c77566dd2d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Stepping.cs
@@ -93,30 +93,30 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="True">Stepping.exe</ModuleLoaded>
     <ModuleLoaded symbols="False">System.dll</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="NextStatement">Start=16,4 End=16,40</Object>
+    <NextStatement>Start=16,4 End=16,40</NextStatement>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=17,4 End=17,44</Object>
+    <NextStatement>Start=17,4 End=17,44</NextStatement>
     <ModuleLoaded symbols="False">System.Configuration.dll</ModuleLoaded>
     <ModuleLoaded symbols="False">System.Xml.dll</ModuleLoaded>
     <LogMessage>1\r\n</LogMessage>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=18,4 End=18,10</Object>
+    <NextStatement>Start=18,4 End=18,10</NextStatement>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=23,3 End=23,4</Object>
+    <NextStatement>Start=23,3 End=23,4</NextStatement>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=24,4 End=24,44</Object>
+    <NextStatement>Start=24,4 End=24,44</NextStatement>
     <LogMessage>2\r\n</LogMessage>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=25,4 End=25,44</Object>
+    <NextStatement>Start=25,4 End=25,44</NextStatement>
     <LogMessage>3\r\n</LogMessage>
     <LogMessage>4\r\n</LogMessage>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=18,4 End=18,10</Object>
+    <NextStatement>Start=18,4 End=18,10</NextStatement>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=19,4 End=19,11</Object>
+    <NextStatement>Start=19,4 End=19,11</NextStatement>
     <LogMessage>5\r\n</LogMessage>
     <DebuggingPaused>StepComplete</DebuggingPaused>
-    <Object name="NextStatement">Start=20,3 End=20,4</Object>
+    <NextStatement>Start=20,3 End=20,4</NextStatement>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
index 11d6f18103..54e222559b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs
@@ -54,7 +54,7 @@ namespace Debugger.Tests {
     <ModuleLoaded symbols="False">mscorlib.dll</ModuleLoaded>
     <ModuleLoaded symbols="True">ValueType.exe</ModuleLoaded>
     <DebuggingPaused>Break</DebuggingPaused>
-    <Object name="this" Type="Value" ToString="this = {Debugger.Tests.ValueType}">
+    <this Type="Value" ToString="this = {Debugger.Tests.ValueType}">
       <IsArray>False</IsArray>
       <ArrayLenght exception="Value is not an array" />
       <ArrayRank exception="Value is not an array" />
@@ -105,7 +105,7 @@ namespace Debugger.Tests {
           </BaseType>
         </BaseType>
       </Type>
-    </Object>
+    </this>
     <ProcessExited />
   </Test>
 </DebuggerTests>