Some ToStrings are more verbose. Removed some Ignore attributes.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5113 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/AppDomain.cs

@@ -17,7 +17,6 @@ namespace Debugger
 		
 		ICorDebugAppDomain corAppDomain;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs

@@ -37,12 +37,10 @@ namespace Debugger
 		Value         result;
 		EvalState     state;
 		
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return appDomain; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs

@@ -36,12 +36,10 @@ namespace Debugger
 			}
 		}
 		
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return appDomain; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs

@@ -230,7 +230,6 @@ namespace Debugger
 	{
 		Process process;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StackFrame.cs

@@ -37,12 +37,10 @@ namespace Debugger
 		uint frameIndex;
 		
 		/// <summary> The process in which this stack frame is executed </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return appDomain; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}
@@ -53,11 +51,8 @@ namespace Debugger
 		}
 		
 		/// <summary> A thread in which the stack frame is executed </summary>
-		[Debugger.Tests.Ignore]
 		public Thread Thread {
-			get {
-				return thread;
-			}
+			get { return thread; }
 		}
 		
 		/// <summary> Internal index of the stack chain.  The value is increasing with age. </summary>
@@ -125,8 +120,7 @@ namespace Debugger
 		/// <summary> Returns diagnostic description of the frame </summary>
 		public override string ToString()
 		{
-			// TODO: Use full name
-			return this.MethodInfo.DeclaringType.FullName + "." + this.MethodInfo.Name;
+			return this.MethodInfo.ToString();
 		}
 		
 		internal ICorDebugILFrame CorILFrame {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs

@@ -25,7 +25,6 @@ namespace Debugger
 		
 		public event EventHandler<StepperEventArgs> StepComplete;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return stackFrame.Process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs

@@ -37,7 +37,6 @@ namespace Debugger
 		public event EventHandler<ThreadEventArgs> NameChanged;
 		public event EventHandler<ThreadEventArgs> Exited;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}
@@ -269,7 +268,6 @@ namespace Debugger
 		
 		/// <summary> Gets the whole callstack of the Thread. </summary>
 		/// <remarks> If the thread is in invalid state returns empty array </remarks>
-		[Debugger.Tests.Ignore]
 		public StackFrame[] GetCallstack()
 		{
 			return new List<StackFrame>(CallstackEnum).ToArray();
@@ -427,7 +425,6 @@ namespace Debugger
 	{
 		Thread thread;
 		
-		[Debugger.Tests.Ignore]
 		public Thread Thread {
 			get {
 				return thread;

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggeeState.cs

@@ -21,7 +21,6 @@ namespace Debugger
 	{
 		Process process;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PauseSession.cs

@@ -16,7 +16,6 @@ namespace Debugger
 		Process process;
 		PausedReason pausedReason;
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return process; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/ExpandAttribute.cs

@@ -9,7 +9,7 @@ using System;
 
 namespace Debugger.Tests
 {
-	[AttributeUsage(AttributeTargets.Property)]
+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
 	public class ExpandAttribute: Attribute
 	{
 		

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugFieldInfo.cs

@@ -32,24 +32,20 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> The AppDomain in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return declaringType.AppDomain; }
 		}
 		
 		/// <summary> The Process in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return declaringType.Process; }
 		}
 		
 		/// <summary> The Module in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Debugger.Module DebugModule {
 			get { return declaringType.DebugModule; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public override int MetadataToken {
 			get { return (int)fieldProps.Token; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugMethodInfo.cs

@@ -36,24 +36,20 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> The AppDomain in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return declaringType.AppDomain; }
 		}
 		
 		/// <summary> The Process in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return declaringType.Process; }
 		}
 		
 		/// <summary> The Module in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Debugger.Module DebugModule {
 			get { return declaringType.DebugModule; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public override int MetadataToken {
 			get { return (int)methodProps.Token; }
 		}
@@ -597,8 +593,16 @@ namespace Debugger.MetaData
 		
 		public override string ToString()
 		{
-			// TODO: Use full name
-			return this.Name;
+			string txt = string.Empty;
+			if (this.IsStatic)
+				txt += "static ";
+			if (this.ReturnType != null) {
+				txt += this.ReturnType.FullName + " ";
+			} else {
+				txt += "void ";
+			}
+			txt += this.FullName;
+			return txt;
 		}
 	}
 }

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugPropertyInfo.cs

@@ -35,24 +35,20 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> The AppDomain in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return declaringType.AppDomain; }
 		}
 		
 		/// <summary> The Process in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return declaringType.Process; }
 		}
 		
 		/// <summary> The Module in which this member is declared </summary>
-		[Debugger.Tests.Ignore]
 		public Debugger.Module DebugModule {
 			get { return declaringType.DebugModule; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public override int MetadataToken {
 			get { return 0; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs

@@ -60,28 +60,22 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> The AppDomain in which this type is loaded </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return module.AppDomain; }
 		}
 		
 		/// <summary> The Process in which this type is loaded </summary>
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return module.Process; }
 		}
 		
 		/// <summary> The Module in which this type is loaded </summary>
-		[Debugger.Tests.Ignore]
 		public Debugger.Module DebugModule {
 			get { return module; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public override int MetadataToken {
-			get {
-				return (int)classProps.Token;
-			}
+			get { return (int)classProps.Token; }
 		}
 		
 		public override System.Reflection.Module Module {
@@ -540,7 +534,7 @@ namespace Debugger.MetaData
 		//		protected virtual bool IsMarshalByRefImpl();
 		
 		/// <summary> Returns simple managed type coresponding to the primitive type. </summary>
-		[Tests.Ignore]
+		[Debugger.Tests.Ignore]
 		public System.Type PrimitiveType {
 			get { return primitiveType; }
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.Array.cs

@@ -102,9 +102,9 @@ namespace Debugger
 		}
 		
 		/// <summary> Returns all elements in the array </summary>
-		[Debugger.Tests.Ignore]
 		public Value[] GetArrayElements()
 		{
+			if (!this.Type.IsArray) return null;
 			List<Value> values = new List<Value>();
 			foreach(int[] indices in this.ArrayDimensions.Indices) {
 				values.Add(GetArrayElement(indices));

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs

@@ -46,12 +46,10 @@ namespace Debugger
 		}
 		
 		/// <summary> The appdomain that owns the value </summary>
-		[Debugger.Tests.Ignore]
 		public AppDomain AppDomain {
 			get { return appDomain; }
 		}
 		
-		[Debugger.Tests.Ignore]
 		public Process Process {
 			get { return appDomain.Process; }
 		}
@@ -65,7 +63,7 @@ namespace Debugger
 			}
 		}
 		
-		[Tests.Ignore]
+		[Debugger.Tests.Ignore]
 		public ICorDebugValue CorValue {
 			get {
 				if (this.IsInvalid)
@@ -85,7 +83,7 @@ namespace Debugger
 		/// <summary>
 		/// Gets the address in memory where this value is stored
 		/// </summary>
-		[Debugger.Tests.IgnoreAttribute]
+		[Debugger.Tests.Ignore]
 		public ulong Address {
 			get { return corValue.Address; }
 		}
@@ -156,7 +154,7 @@ namespace Debugger
 			get { return type; }
 		}
 		
-		[Tests.Ignore]
+		[Debugger.Tests.Ignore]
 		public ulong PointerAddress {
 			get {
 				if (!this.Type.IsPointer) throw new DebuggerException("Not a pointer");

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs

@@ -64,6 +64,10 @@ namespace Debugger.Tests
 			                          	"*.GetType",
 			                          	"*.GetHashCode",
 			                          	"*.GetEnumerator",
+			                          	"*.AppDomain",
+			                          	"*.Process",
+			                          	"MemberInfo.DebugModule",
+			                          	"MemberInfo.MetadataToken",
 			                          	"MemberInfo.MemberType",
 			                          	"MemberInfo.IsPublic",
 			                          	"Type.DeclaringType",

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ControlFlow_MainThreadExit.cs

@@ -67,25 +67,27 @@ namespace Debugger.Tests {
       <Item>
         <Thread
           CurrentExceptionType="0"
+          GetCallstack="{static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main()}"
           IsAtSafePoint="True"
           IsInValidState="True"
-          MostRecentStackFrame="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main"
-          MostRecentStackFrameWithLoadedSymbols="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main"
+          MostRecentStackFrame="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main()"
+          MostRecentStackFrameWithLoadedSymbols="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main()"
           Name=""
-          OldestStackFrame="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main"
+          OldestStackFrame="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main()"
           Priority="Normal"
           RuntimeValue="{System.Threading.Thread}"
-          SelectedStackFrame="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main" />
+          SelectedStackFrame="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.Main()" />
       </Item>
       <Item>
         <Thread
           CurrentExceptionType="0"
+          GetCallstack="{static System.Boolean System.Threading.WaitHandle.InternalWaitOne(SafeHandle waitableSafeHandle, Int64 millisecondsTimeout, Boolean hasThreadAffinity, Boolean exitContext), System.Boolean System.Threading.WaitHandle.WaitOne(Int32 millisecondsTimeout, Boolean exitContext), System.Boolean System.Threading.WaitHandle.WaitOne(), static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime(), static void System.Threading.ThreadHelper.ThreadStart_Context(Object state), static void System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean ignoreSyncCtx), static void System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state), void System.Threading.ThreadHelper.ThreadStart()}"
           IsAtSafePoint="True"
           IsInValidState="True"
-          MostRecentStackFrame="System.Threading.WaitHandle.InternalWaitOne"
-          MostRecentStackFrameWithLoadedSymbols="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime"
+          MostRecentStackFrame="static System.Boolean System.Threading.WaitHandle.InternalWaitOne(SafeHandle waitableSafeHandle, Int64 millisecondsTimeout, Boolean hasThreadAffinity, Boolean exitContext)"
+          MostRecentStackFrameWithLoadedSymbols="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime()"
           Name="Worker thread"
-          OldestStackFrame="System.Threading.ThreadHelper.ThreadStart"
+          OldestStackFrame="void System.Threading.ThreadHelper.ThreadStart()"
           Priority="Normal"
           RuntimeValue="{System.Threading.Thread}" />
       </Item>
@@ -104,15 +106,16 @@ namespace Debugger.Tests {
       <Item>
         <Thread
           CurrentExceptionType="0"
+          GetCallstack="{static System.Boolean System.Threading.WaitHandle.InternalWaitOne(SafeHandle waitableSafeHandle, Int64 millisecondsTimeout, Boolean hasThreadAffinity, Boolean exitContext), System.Boolean System.Threading.WaitHandle.WaitOne(Int32 millisecondsTimeout, Boolean exitContext), System.Boolean System.Threading.WaitHandle.WaitOne(), static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime(), static void System.Threading.ThreadHelper.ThreadStart_Context(Object state), static void System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean ignoreSyncCtx), static void System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state), void System.Threading.ThreadHelper.ThreadStart()}"
           IsAtSafePoint="True"
           IsInValidState="True"
-          MostRecentStackFrame="System.Threading.WaitHandle.InternalWaitOne"
-          MostRecentStackFrameWithLoadedSymbols="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime"
+          MostRecentStackFrame="static System.Boolean System.Threading.WaitHandle.InternalWaitOne(SafeHandle waitableSafeHandle, Int64 millisecondsTimeout, Boolean hasThreadAffinity, Boolean exitContext)"
+          MostRecentStackFrameWithLoadedSymbols="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime()"
           Name="Worker thread"
-          OldestStackFrame="System.Threading.ThreadHelper.ThreadStart"
+          OldestStackFrame="void System.Threading.ThreadHelper.ThreadStart()"
           Priority="Normal"
           RuntimeValue="{System.Threading.Thread}"
-          SelectedStackFrame="Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime" />
+          SelectedStackFrame="static void Debugger.Tests.TestPrograms.ControlFlow_MainThreadExit.WaitForALongTime()" />
       </Item>
     </ThreadsAfterExit>
     <ProcessExited />

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackFrame_Callstack.cs

@@ -64,23 +64,26 @@ namespace Debugger.Tests {
           ChainIndex="1"
           FrameIndex="2"
           HasSymbols="True"
-          MethodInfo="Sub2"
-          NextStatement="StackFrame_Callstack.cs:26,4-26,40" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Sub2()"
+          NextStatement="StackFrame_Callstack.cs:26,4-26,40"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
         <StackFrame
           ChainIndex="1"
           FrameIndex="1"
           HasSymbols="True"
-          MethodInfo="Sub1"
-          NextStatement="StackFrame_Callstack.cs:21,4-21,11" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Sub1()"
+          NextStatement="StackFrame_Callstack.cs:21,4-21,11"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
         <StackFrame
           ChainIndex="1"
           HasSymbols="True"
-          MethodInfo="Main"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Main()"
+          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
     <DebuggingPaused>StepComplete StackFrame_Callstack.cs:21,4-21,11</DebuggingPaused>
@@ -90,15 +93,17 @@ namespace Debugger.Tests {
           ChainIndex="1"
           FrameIndex="1"
           HasSymbols="True"
-          MethodInfo="Sub1"
-          NextStatement="StackFrame_Callstack.cs:21,4-21,11" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Sub1()"
+          NextStatement="StackFrame_Callstack.cs:21,4-21,11"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
       <Item>
         <StackFrame
           ChainIndex="1"
           HasSymbols="True"
-          MethodInfo="Main"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Main()"
+          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
     <DebuggingPaused>StepComplete StackFrame_Callstack.cs:16,4-16,11</DebuggingPaused>
@@ -107,8 +112,9 @@ namespace Debugger.Tests {
         <StackFrame
           ChainIndex="1"
           HasSymbols="True"
-          MethodInfo="Main"
-          NextStatement="StackFrame_Callstack.cs:16,4-16,11" />
+          MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Callstack.Main()"
+          NextStatement="StackFrame_Callstack.cs:16,4-16,11"
+          Thread="Thread Name =  Suspended = False" />
       </Item>
     </Callstack>
     <ProcessExited />

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackFrame_Lifetime.cs

@@ -77,8 +77,9 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="1"
         HasSymbols="True"
-        MethodInfo="Function"
-        NextStatement="StackFrame_Lifetime.cs:22,4-22,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Function(Int32 i)"
+        NextStatement="StackFrame_Lifetime.cs:22,4-22,40"
+        Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <DebuggingPaused>Break StackFrame_Lifetime.cs:29,4-29,40</DebuggingPaused>
     <Old_StackFrame>
@@ -87,16 +88,18 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="1"
         HasSymbols="True"
-        MethodInfo="Function"
-        NextStatement="StackFrame_Lifetime.cs:23,4-23,18" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Function(Int32 i)"
+        NextStatement="StackFrame_Lifetime.cs:23,4-23,18"
+        Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
       <StackFrame
         ChainIndex="1"
         FrameIndex="2"
         HasSymbols="True"
-        MethodInfo="SubFunction"
-        NextStatement="StackFrame_Lifetime.cs:29,4-29,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.SubFunction()"
+        NextStatement="StackFrame_Lifetime.cs:29,4-29,40"
+        Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <DebuggingPaused>Break StackFrame_Lifetime.cs:24,4-24,40</DebuggingPaused>
     <Old_StackFrame>
@@ -105,8 +108,9 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="1"
         HasSymbols="True"
-        MethodInfo="Function"
-        NextStatement="StackFrame_Lifetime.cs:24,4-24,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Function(Int32 i)"
+        NextStatement="StackFrame_Lifetime.cs:24,4-24,40"
+        Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
       <StackFrame
@@ -114,16 +118,18 @@ namespace Debugger.Tests {
         ChainIndex="1"
         FrameIndex="1"
         HasSymbols="True"
-        MethodInfo="Function"
-        NextStatement="StackFrame_Lifetime.cs:24,4-24,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Function(Int32 i)"
+        NextStatement="StackFrame_Lifetime.cs:24,4-24,40"
+        Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <DebuggingPaused>Break StackFrame_Lifetime.cs:17,4-17,40</DebuggingPaused>
     <Main>
       <StackFrame
         ChainIndex="1"
         HasSymbols="True"
-        MethodInfo="Main"
-        NextStatement="StackFrame_Lifetime.cs:17,4-17,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Main()"
+        NextStatement="StackFrame_Lifetime.cs:17,4-17,40"
+        Thread="Thread Name =  Suspended = False" />
     </Main>
     <Old_StackFrame>
       <StackFrame
@@ -132,15 +138,17 @@ namespace Debugger.Tests {
         FrameIndex="1"
         HasSymbols="True"
         IsInvalid="True"
-        MethodInfo="Function"
-        NextStatement="{Exception: The requested frame index is too big}" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Function(Int32 i)"
+        NextStatement="{Exception: The requested frame index is too big}"
+        Thread="Thread Name =  Suspended = False" />
     </Old_StackFrame>
     <SelectedStackFrame>
       <StackFrame
         ChainIndex="1"
         HasSymbols="True"
-        MethodInfo="Main"
-        NextStatement="StackFrame_Lifetime.cs:17,4-17,40" />
+        MethodInfo="static void Debugger.Tests.TestPrograms.StackFrame_Lifetime.Main()"
+        NextStatement="StackFrame_Lifetime.cs:17,4-17,40"
+        Thread="Thread Name =  Suspended = False" />
     </SelectedStackFrame>
     <ProcessExited />
   </Test>

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Thread_Name.cs

@@ -57,11 +57,12 @@ namespace Debugger.Tests {
     <ThreadStartedEvent>
       <Thread
         CurrentExceptionType="0"
+        GetCallstack="{void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile)}"
         IsAtSafePoint="True"
         IsInValidState="True"
-        MostRecentStackFrame="System.AppDomain.SetupDomain"
+        MostRecentStackFrame="void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile)"
         Name=""
-        OldestStackFrame="System.AppDomain.SetupDomain"
+        OldestStackFrame="void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile)"
         Priority="Normal"
         RuntimeValue="null" />
     </ThreadStartedEvent>
@@ -70,38 +71,41 @@ namespace Debugger.Tests {
     <Thread>
       <Thread
         CurrentExceptionType="0"
+        GetCallstack="{static void Debugger.Tests.TestPrograms.Thread_Name.Main()}"
         IsAtSafePoint="True"
         IsInValidState="True"
-        MostRecentStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main"
-        MostRecentStackFrameWithLoadedSymbols="Debugger.Tests.TestPrograms.Thread_Name.Main"
+        MostRecentStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
+        MostRecentStackFrameWithLoadedSymbols="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
         Name=""
-        OldestStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main"
+        OldestStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
         Priority="AboveNormal"
         RuntimeValue="{System.Threading.Thread}"
-        SelectedStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main" />
+        SelectedStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()" />
     </Thread>
     <DebuggingPaused>Break Thread_Name.cs:19,4-19,40</DebuggingPaused>
     <Thread>
       <Thread
         CurrentExceptionType="0"
+        GetCallstack="{static void Debugger.Tests.TestPrograms.Thread_Name.Main()}"
         IsAtSafePoint="True"
         IsInValidState="True"
-        MostRecentStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main"
-        MostRecentStackFrameWithLoadedSymbols="Debugger.Tests.TestPrograms.Thread_Name.Main"
+        MostRecentStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
+        MostRecentStackFrameWithLoadedSymbols="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
         Name="ThreadName"
-        OldestStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main"
+        OldestStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()"
         Priority="AboveNormal"
         RuntimeValue="{System.Threading.Thread}"
-        SelectedStackFrame="Debugger.Tests.TestPrograms.Thread_Name.Main" />
+        SelectedStackFrame="static void Debugger.Tests.TestPrograms.Thread_Name.Main()" />
     </Thread>
     <ThreadStartedEvent>
       <Thread
         CurrentExceptionType="0"
+        GetCallstack="{void System.Threading.ReaderWriterLock.Finalize()}"
         IsAtSafePoint="True"
         IsInValidState="True"
-        MostRecentStackFrame="System.Threading.ReaderWriterLock.Finalize"
+        MostRecentStackFrame="void System.Threading.ReaderWriterLock.Finalize()"
         Name=""
-        OldestStackFrame="System.Threading.ReaderWriterLock.Finalize"
+        OldestStackFrame="void System.Threading.ReaderWriterLock.Finalize()"
         Priority="Normal"
         RuntimeValue="null" />
     </ThreadStartedEvent>

src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueTest.cs

@@ -41,7 +41,7 @@ namespace Debugger.Tests {
 			
 			Value array = process.SelectedStackFrame.GetLocalVariableValue("array").GetPermanentReference();
 			ObjectDump("array.Length", array.GetMemberValue("Length"));
-			ObjectDump("array elements", array.GetArrayElements());
+			ObjectDump("array", array);
 			
 			EndTest();
 		}
@@ -96,32 +96,17 @@ namespace Debugger.Tests {
         PrimitiveValue="4"
         Type="System.Int32" />
     </array.Length>
-    <array_elements>
-      <Item>
-        <Value
-          AsString="0"
-          PrimitiveValue="0"
-          Type="System.Int32" />
-      </Item>
-      <Item>
-        <Value
-          AsString="1"
-          PrimitiveValue="1"
-          Type="System.Int32" />
-      </Item>
-      <Item>
-        <Value
-          AsString="2"
-          PrimitiveValue="2"
-          Type="System.Int32" />
-      </Item>
-      <Item>
-        <Value
-          AsString="3"
-          PrimitiveValue="3"
-          Type="System.Int32" />
-      </Item>
-    </array_elements>
+    <array>
+      <Value
+        ArrayDimensions="{2, 2}"
+        ArrayLength="4"
+        ArrayRank="2"
+        AsString="{System.Int32[,]}"
+        GetArrayElements="{0, 1, 2, 3}"
+        IsReference="True"
+        PrimitiveValue="{Exception: Value is not a primitive type}"
+        Type="System.Int32[,]" />
+    </array>
     <ProcessExited />
   </Test>
 </DebuggerTests>