Pretty printing of unit tests: Collapsed Is* into one property. Inline enumerators.

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

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

@@ -12,6 +12,8 @@ using Debugger.Wrappers.MetaData;
 
 namespace Debugger.MetaData
 {
+	public enum DebugTypeKind { Array, Class, ValueType, Primitive, Pointer, Void };
+	
 	/// <summary>
 	/// Represents a type in a debugee. That is, a class, array, value type or a primitive type.
 	/// This class mimics the <see cref="System.Type"/> class.
@@ -19,15 +21,6 @@ namespace Debugger.MetaData
 	/// <remarks>
 	/// If two types are identical, the references to DebugType will also be identical 
 	/// Type will be loaded once per each appdomain.
-	/// <para>
-	/// Preciesly one of these properties shall be true
-	///  - IsArray
-	///  - IsClass
-	///  - IsValueType
-	///  - IsPrimitive
-	///  - IsPointer
-	///  - IsVoid
-	/// </para>
 	/// </remarks>
 	public partial class DebugType: DebuggerObject
 	{
@@ -167,60 +160,82 @@ namespace Debugger.MetaData
 			}
 		}
 		
+		/// <summary> Returns what kind of type this is. (eg. value type) </summary>
+		public DebugTypeKind Kind {
+			get {
+				switch (this.corElementType) {
+					case CorElementType.BOOLEAN:
+					case CorElementType.CHAR:
+					case CorElementType.I1:
+					case CorElementType.U1:
+					case CorElementType.I2:
+					case CorElementType.U2:
+					case CorElementType.I4:
+					case CorElementType.U4:
+					case CorElementType.I8:
+					case CorElementType.U8:
+					case CorElementType.R4:
+					case CorElementType.R8:
+					case CorElementType.I:
+					case CorElementType.U:
+					case CorElementType.STRING:    return DebugTypeKind.Primitive;
+					case CorElementType.ARRAY:
+					case CorElementType.SZARRAY:   return DebugTypeKind.Array;
+					case CorElementType.CLASS:
+					case CorElementType.OBJECT:    return DebugTypeKind.Class;
+					case CorElementType.VALUETYPE: return DebugTypeKind.ValueType;
+					case CorElementType.PTR:
+					case CorElementType.BYREF:     return DebugTypeKind.Pointer;
+					case CorElementType.VOID:      return DebugTypeKind.Void;
+					default: throw new DebuggerException("Unknown kind of type");
+				}
+			}
+		}
+		
 		/// <summary> Gets a value indicating whether the type is an array </summary>
+		[Tests.Ignore]
 		public bool IsArray {
 			get {
-				return this.corElementType == CorElementType.ARRAY ||
+				return this.Kind == DebugTypeKind.Array;
-				       this.corElementType == CorElementType.SZARRAY;
 			}
 		}
 		
 		/// <summary> Gets a value indicating whether the type is a class </summary>
+		[Tests.Ignore]
 		public bool IsClass {
-			get { 
+			get {
-				return this.corElementType == CorElementType.CLASS ||
+				return this.Kind == DebugTypeKind.Class;
-				       this.corElementType == CorElementType.OBJECT;
 			}
 		}
 		
 		/// <summary> Returns true if this type represents interface </summary>
+		[Tests.Ignore]
 		public bool IsInterface {
 			get {
-				return IsClass && classProps.IsInterface;
+				return this.Kind == DebugTypeKind.Class && classProps.IsInterface;
 			}
 		}
 		
 		/// <summary> Gets a value indicating whether the type is a value type (that is, a structre in C#).
 		/// Return false, if the type is a primitive type. </summary>
+		[Tests.Ignore]
 		public bool IsValueType {
 			get {
-				return this.corElementType == CorElementType.VALUETYPE;
+				return this.Kind == DebugTypeKind.ValueType;
 			}
 		}
 		
 		/// <summary> Gets a value indicating whether the type is a primitive type </summary>
 		/// <remarks> Primitive types are: boolean, char, string and all numeric types </remarks>
+		[Tests.Ignore]
 		public bool IsPrimitive {
 			get {
-				return this.corElementType == CorElementType.BOOLEAN ||
+				return this.Kind == DebugTypeKind.Primitive;
-				       this.corElementType == CorElementType.CHAR ||
-				       this.corElementType == CorElementType.I1 ||
-				       this.corElementType == CorElementType.U1 ||
-				       this.corElementType == CorElementType.I2 ||
-				       this.corElementType == CorElementType.U2 ||
-				       this.corElementType == CorElementType.I4 ||
-				       this.corElementType == CorElementType.U4 ||
-				       this.corElementType == CorElementType.I8 ||
-				       this.corElementType == CorElementType.U8 ||
-				       this.corElementType == CorElementType.R4 ||
-				       this.corElementType == CorElementType.R8 ||
-				       this.corElementType == CorElementType.I ||
-				       this.corElementType == CorElementType.U ||
-				       this.corElementType == CorElementType.STRING;
 			}
 		}
 		
 		/// <summary> Gets a value indicating whether the type is an integer type </summary>
+		[Tests.Ignore]
 		public bool IsInteger {
 			get {
 				return this.corElementType == CorElementType.I1 ||
@@ -237,6 +252,7 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> Gets a value indicating whether the type is an string </summary>
+		[Tests.Ignore]
 		public bool IsString {
 			get {
 				return this.corElementType == CorElementType.STRING;
@@ -244,17 +260,18 @@ namespace Debugger.MetaData
 		}
 		
 		/// <summary> Gets a value indicating whether the type is an managed or unmanaged pointer </summary>
+		[Tests.Ignore]
 		public bool IsPointer {
 			get {
-				return this.corElementType == CorElementType.PTR ||
+				return this.Kind == DebugTypeKind.Pointer;
-				       this.corElementType == CorElementType.BYREF;
 			}
 		}
 		
 		/// <summary> Gets a value indicating whether the type is the void type </summary>
+		[Tests.Ignore]
 		public bool IsVoid {
 			get {
-				return this.corElementType == CorElementType.VOID;
+				return this.Kind == DebugTypeKind.Void;
 			}
 		}
 		

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

@@ -49,7 +49,9 @@ namespace Debugger
 				if (this.Type.IsClass)     return "{" + this.Type.FullName + "}";
 				if (this.Type.IsValueType) return "{" + this.Type.FullName + "}";
 				if (this.Type.IsPrimitive) return PrimitiveValue.ToString();
-				if (this.Type.IsPointer)   return "0x" + this.CorValue.CastTo<ICorDebugReferenceValue>().Address.ToString("X8");
+				// Does not work well with unit tests: (variable value)
+				// if (this.Type.IsPointer)   return "0x" + this.CorValue.CastTo<ICorDebugReferenceValue>().Address.ToString("X8");
+				if (this.Type.IsPointer)   return "{" + this.Type.FullName + "}";
 				if (this.Type.IsVoid)      return "void";
 				throw new DebuggerException("Unknown type");
 			}

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

@@ -267,8 +267,16 @@ namespace Debugger.Tests
 					val = "{Exception: " + e.Message + "}";
 				}
 				if (val == null) val = "null";
+				if (val is IEnumerable && !(val is string)) {
+					List<string> vals = new List<string>();
+					foreach(object o in (IEnumerable)val) {
+						vals.Add(o.ToString());
+					}
+					container.SetAttribute(property.Name, "{" + string.Join(", ", vals.ToArray()) + "}");
+				} else {
+					container.SetAttribute(property.Name, val.ToString());
+				}
 				
-				container.SetAttribute(property.Name, val.ToString());
 				
 				if (ShouldExpandProperty(property)) {
 					XmlElement propertyNode = doc.CreateElement(property.Name);

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

@@ -57,7 +57,7 @@ namespace Debugger.Tests {
     <DebuggingPaused>Break</DebuggingPaused>
     <array>
       <Value
-        ArrayDimensions="[5]"
+        ArrayDimensions="{5}"
         ArrayLenght="5"
         ArrayRank="1"
         AsString="{System.Int32[]}"
@@ -134,51 +134,27 @@ namespace Debugger.Tests {
         BaseType="System.Array"
         ElementType="System.Int32"
         FullName="System.Int32[]"
-        GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+        GenericArguments="{}"
-        Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+        Interfaces="{}"
-        IsArray="True"
+        Kind="Array"
-        IsClass="False"
-        IsInteger="False"
-        IsInterface="False"
-        IsPointer="False"
-        IsPrimitive="False"
-        IsString="False"
-        IsValueType="False"
-        IsVoid="False"
         Module="{Exception: The type is not a class or value type.}">
         <BaseType>
           <DebugType
             BaseType="System.Object"
             ElementType="null"
             FullName="System.Array"
-            GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+            GenericArguments="{}"
-            Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+            Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
-            IsArray="False"
+            Kind="Class"
-            IsClass="True"
-            IsInteger="False"
-            IsInterface="False"
-            IsPointer="False"
-            IsPrimitive="False"
-            IsString="False"
-            IsValueType="False"
-            IsVoid="False"
             Module="mscorlib.dll">
             <BaseType>
               <DebugType
                 BaseType="null"
                 ElementType="null"
                 FullName="System.Object"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="mscorlib.dll">
                 <BaseType>null</BaseType>
               </DebugType>

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

@@ -70,17 +70,9 @@ namespace Debugger.Tests {
           BaseType="System.Object"
           ElementType="null"
           FullName="Debugger.Tests.TestPrograms.DefinedTypes_Class"
-          GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+          GenericArguments="{}"
-          Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+          Interfaces="{}"
-          IsArray="False"
+          Kind="Class"
-          IsClass="True"
-          IsInteger="False"
-          IsInterface="False"
-          IsPointer="False"
-          IsPrimitive="False"
-          IsString="False"
-          IsValueType="False"
-          IsVoid="False"
           Module="DefinedTypes.exe" />
       </Item>
       <Item>
@@ -88,17 +80,9 @@ namespace Debugger.Tests {
           BaseType="System.ValueType"
           ElementType="null"
           FullName="Debugger.Tests.TestPrograms.DefinedTypes_Struct"
-          GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+          GenericArguments="{}"
-          Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+          Interfaces="{}"
-          IsArray="False"
+          Kind="ValueType"
-          IsClass="False"
-          IsInteger="False"
-          IsInterface="False"
-          IsPointer="False"
-          IsPrimitive="False"
-          IsString="False"
-          IsValueType="True"
-          IsVoid="False"
           Module="DefinedTypes.exe" />
       </Item>
     </Types>

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

@@ -212,7 +212,7 @@ namespace Debugger.Tests {
       Count="1">
       <Item>
         <Value
-          ArrayDimensions="[0]"
+          ArrayDimensions="{0}"
           ArrayLenght="0"
           ArrayRank="1"
           AsString="{System.String[]}"
@@ -229,7 +229,7 @@ namespace Debugger.Tests {
       Count="1">
       <Item>
         <Value
-          ArrayDimensions="[1]"
+          ArrayDimensions="{1}"
           ArrayLenght="1"
           ArrayRank="1"
           AsString="{System.String[]}"
@@ -246,7 +246,7 @@ namespace Debugger.Tests {
       Count="1">
       <Item>
         <Value
-          ArrayDimensions="[2]"
+          ArrayDimensions="{2}"
           ArrayLenght="2"
           ArrayRank="1"
           AsString="{System.String[]}"

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

@@ -78,7 +78,7 @@ namespace Debugger.Tests {
       </Item>
       <Item>
         <Value
-          ArrayDimensions="[1]"
+          ArrayDimensions="{1}"
           ArrayLenght="1"
           ArrayRank="1"
           AsString="{System.String[]}"

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

@@ -157,17 +157,9 @@ namespace Debugger.Tests {
                 BaseType="System.Object"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericClass<System.Int32,System.String>"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -228,17 +220,9 @@ namespace Debugger.Tests {
                 BaseType="System.Object"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -299,17 +283,9 @@ namespace Debugger.Tests {
                 BaseType="System.Object"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -370,17 +346,9 @@ namespace Debugger.Tests {
                 BaseType="System.Object"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericClass&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -441,17 +409,9 @@ namespace Debugger.Tests {
                 BaseType="System.ValueType"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="ValueType"
-                IsClass="False"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="True"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -512,17 +472,9 @@ namespace Debugger.Tests {
                 BaseType="System.ValueType"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="ValueType"
-                IsClass="False"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="True"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -583,17 +535,9 @@ namespace Debugger.Tests {
                 BaseType="System.ValueType"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="ValueType"
-                IsClass="False"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="True"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>
@@ -654,17 +598,9 @@ namespace Debugger.Tests {
                 BaseType="System.ValueType"
                 ElementType="null"
                 FullName="Debugger.Tests.TestPrograms.GenericStruct&lt;System.Int32,System.String&gt;"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{System.Int32, System.String}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="ValueType"
-                IsClass="False"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="True"
-                IsVoid="False"
                 Module="Generics.exe" />
             </DeclaringType>
           </MethodInfo>

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

@@ -75,34 +75,18 @@ namespace Debugger.Tests {
               BaseType="System.Object"
               ElementType="null"
               FullName="System.Boolean"
-              GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              GenericArguments="{}"
-              Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              Interfaces="{}"
-              IsArray="False"
+              Kind="Primitive"
-              IsClass="False"
-              IsInteger="False"
-              IsInterface="False"
-              IsPointer="False"
-              IsPrimitive="True"
-              IsString="False"
-              IsValueType="False"
-              IsVoid="False"
               Module="{Exception: The type is not a class or value type.}">
               <BaseType>
                 <DebugType
                   BaseType="null"
                   ElementType="null"
                   FullName="System.Object"
-                  GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  GenericArguments="{}"
-                  Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  Interfaces="{}"
-                  IsArray="False"
+                  Kind="Class"
-                  IsClass="True"
-                  IsInteger="False"
-                  IsInterface="False"
-                  IsPointer="False"
-                  IsPrimitive="False"
-                  IsString="False"
-                  IsValueType="False"
-                  IsVoid="False"
                   Module="mscorlib.dll">
                   <BaseType>null</BaseType>
                 </DebugType>
@@ -127,34 +111,18 @@ namespace Debugger.Tests {
               BaseType="System.Object"
               ElementType="null"
               FullName="System.Int32"
-              GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              GenericArguments="{}"
-              Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              Interfaces="{}"
-              IsArray="False"
+              Kind="Primitive"
-              IsClass="False"
-              IsInteger="True"
-              IsInterface="False"
-              IsPointer="False"
-              IsPrimitive="True"
-              IsString="False"
-              IsValueType="False"
-              IsVoid="False"
               Module="{Exception: The type is not a class or value type.}">
               <BaseType>
                 <DebugType
                   BaseType="null"
                   ElementType="null"
                   FullName="System.Object"
-                  GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  GenericArguments="{}"
-                  Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  Interfaces="{}"
-                  IsArray="False"
+                  Kind="Class"
-                  IsClass="True"
-                  IsInteger="False"
-                  IsInterface="False"
-                  IsPointer="False"
-                  IsPrimitive="False"
-                  IsString="False"
-                  IsValueType="False"
-                  IsVoid="False"
                   Module="mscorlib.dll">
                   <BaseType>null</BaseType>
                 </DebugType>
@@ -179,34 +147,18 @@ namespace Debugger.Tests {
               BaseType="System.Object"
               ElementType="null"
               FullName="System.String"
-              GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              GenericArguments="{}"
-              Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              Interfaces="{}"
-              IsArray="False"
+              Kind="Primitive"
-              IsClass="False"
-              IsInteger="False"
-              IsInterface="False"
-              IsPointer="False"
-              IsPrimitive="True"
-              IsString="True"
-              IsValueType="False"
-              IsVoid="False"
               Module="{Exception: The type is not a class or value type.}">
               <BaseType>
                 <DebugType
                   BaseType="null"
                   ElementType="null"
                   FullName="System.Object"
-                  GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  GenericArguments="{}"
-                  Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  Interfaces="{}"
-                  IsArray="False"
+                  Kind="Class"
-                  IsClass="True"
-                  IsInteger="False"
-                  IsInterface="False"
-                  IsPointer="False"
-                  IsPrimitive="False"
-                  IsString="False"
-                  IsValueType="False"
-                  IsVoid="False"
                   Module="mscorlib.dll">
                   <BaseType>null</BaseType>
                 </DebugType>
@@ -231,34 +183,18 @@ namespace Debugger.Tests {
               BaseType="System.Object"
               ElementType="null"
               FullName="System.Double"
-              GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              GenericArguments="{}"
-              Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+              Interfaces="{}"
-              IsArray="False"
+              Kind="Primitive"
-              IsClass="False"
-              IsInteger="False"
-              IsInterface="False"
-              IsPointer="False"
-              IsPrimitive="True"
-              IsString="False"
-              IsValueType="False"
-              IsVoid="False"
               Module="{Exception: The type is not a class or value type.}">
               <BaseType>
                 <DebugType
                   BaseType="null"
                   ElementType="null"
                   FullName="System.Object"
-                  GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  GenericArguments="{}"
-                  Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                  Interfaces="{}"
-                  IsArray="False"
+                  Kind="Class"
-                  IsClass="True"
-                  IsInteger="False"
-                  IsInterface="False"
-                  IsPointer="False"
-                  IsPrimitive="False"
-                  IsString="False"
-                  IsValueType="False"
-                  IsVoid="False"
                   Module="mscorlib.dll">
                   <BaseType>null</BaseType>
                 </DebugType>

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

@@ -69,51 +69,27 @@ namespace Debugger.Tests {
             BaseType="System.ValueType"
             ElementType="null"
             FullName="Debugger.Tests.ValueType"
-            GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+            GenericArguments="{}"
-            Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+            Interfaces="{}"
-            IsArray="False"
+            Kind="ValueType"
-            IsClass="False"
-            IsInteger="False"
-            IsInterface="False"
-            IsPointer="False"
-            IsPrimitive="False"
-            IsString="False"
-            IsValueType="True"
-            IsVoid="False"
             Module="ValueType.exe">
             <BaseType>
               <DebugType
                 BaseType="System.Object"
                 ElementType="null"
                 FullName="System.ValueType"
-                GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                GenericArguments="{}"
-                Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                Interfaces="{}"
-                IsArray="False"
+                Kind="Class"
-                IsClass="True"
-                IsInteger="False"
-                IsInterface="False"
-                IsPointer="False"
-                IsPrimitive="False"
-                IsString="False"
-                IsValueType="False"
-                IsVoid="False"
                 Module="mscorlib.dll">
                 <BaseType>
                   <DebugType
                     BaseType="null"
                     ElementType="null"
                     FullName="System.Object"
-                    GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                    GenericArguments="{}"
-                    Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]"
+                    Interfaces="{}"
-                    IsArray="False"
+                    Kind="Class"
-                    IsClass="True"
-                    IsInteger="False"
-                    IsInterface="False"
-                    IsPointer="False"
-                    IsPrimitive="False"
-                    IsString="False"
-                    IsValueType="False"
-                    IsVoid="False"
                     Module="mscorlib.dll">
                     <BaseType>null</BaseType>
                   </DebugType>