From 564262cf1b3aca9b8f32e1964e60b6690a308a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Srbeck=C3=BD?= <dsrbecky@gmail.com>
Date: Wed, 17 Jun 2009 23:28:28 +0000
Subject: [PATCH] Updates of debugger tests for .NET 4.0

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4321 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/Src/TestPrograms/ArrayValue.cs    |  3 +-
 .../Src/TestPrograms/MemoryReadWrite.cs       | 11 +++----
 .../Project/Src/TestPrograms/Metadata.cs      | 31 +------------------
 .../Project/Src/TestPrograms/StackOverflow.cs |  2 +-
 .../Project/Src/TestPrograms/ThreadName.cs    | 19 +++++++++++-
 5 files changed, 26 insertions(+), 40 deletions(-)

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 3303836550..be0f4250a3 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
@@ -27,7 +27,6 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
-		[NUnit.Framework.Ignore("Fails on .NET 4.0")]
 		public void ArrayValue()
 		{
 			ExpandProperties(
@@ -152,7 +151,7 @@ namespace Debugger.Tests {
             ElementType="null"
             FullName="System.Array"
             GenericArguments="{}"
-            Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable}"
+            Interfaces="{System.ICloneable, System.Collections.IList, System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.IStructuralComparable, System.Collections.IStructuralEquatable}"
             Kind="Class"
             Module="mscorlib.dll"
             Name="Array">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MemoryReadWrite.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MemoryReadWrite.cs
index 0f62436995..7efe2806e8 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MemoryReadWrite.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MemoryReadWrite.cs
@@ -26,7 +26,6 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
-		[NUnit.Framework.Ignore("Ignored because it fails too frequently - the expected output seems to be different on each machine (or at least for each .NET/Windows version combination)")]
 		public void MemoryReadWrite()
 		{
 			StartTest("MemoryReadWrite.cs");
@@ -37,13 +36,13 @@ namespace Debugger.Tests {
 			addrHello = DeRef(process.ReadMemory(addrHello, 4));
 			addrWorld = DeRef(process.ReadMemory(addrWorld, 4));
 			
-			byte[] hello = process.ReadMemory(addrHello, 22);
-			byte[] world = process.ReadMemory(addrWorld, 24);
+			byte[] hello = process.ReadMemory(addrHello, 18);
+			byte[] world = process.ReadMemory(addrWorld, 20);
 			
 			ObjectDump("hello", ToHex(hello));
 			ObjectDump("world", ToHex(world));
 			
-			process.WriteMemory(addrWorld + 12, new byte[] {0x77, 0x0, 0x6F, 0x0, 0x72, 0x0, 0x6C, 0x0, 0x64, 0x0});
+			process.WriteMemory(addrWorld + 8, new byte[] {0x77, 0x0, 0x6F, 0x0, 0x72, 0x0, 0x6C, 0x0, 0x64, 0x0});
 			
 			EndTest();
 		}
@@ -75,8 +74,8 @@ namespace Debugger.Tests {
     <ModuleLoaded>MemoryReadWrite.exe (Has symbols)</ModuleLoaded>
     <ModuleLoaded>System.dll (No symbols)</ModuleLoaded>
     <DebuggingPaused>Break MemoryReadWrite.cs:18,4-18,40</DebuggingPaused>
-    <hello>0 A 4D 3 6 0 0 0 5 0 0 0 48 0 65 0 6C 0 6C 0 6F 0 </hello>
-    <world>0 A 4D 3 7 0 0 0 6 0 0 0 20 0 20 0 20 0 20 0 20 0 21 0 </world>
+    <hello>54 B7 A1 79 5 0 0 0 48 0 65 0 6C 0 6C 0 6F 0 </hello>
+    <world>54 B7 A1 79 6 0 0 0 20 0 20 0 20 0 20 0 20 0 21 0 </world>
     <ModuleLoaded>System.Configuration.dll (No symbols)</ModuleLoaded>
     <ModuleLoaded>System.Xml.dll (No symbols)</ModuleLoaded>
     <LogMessage>Hello world!\r\n</LogMessage>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
index 55a7b25965..6bf31b829f 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Metadata.cs
@@ -55,7 +55,6 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
-		[NUnit.Framework.Ignore("Fails on .NET 4.0")]
 		public void Metadata()
 		{
 			StartTest("Metadata.cs");
@@ -80,7 +79,7 @@ namespace Debugger.Tests {
     <DebuggingPaused>Break Metadata.cs:39,4-39,40</DebuggingPaused>
     <Members
       Capacity="64"
-      Count="36">
+      Count="34">
       <Item>
         <FieldInfo
           DeclaringType="Debugger.Tests.TestPrograms.Metadata"
@@ -426,20 +425,6 @@ namespace Debugger.Tests {
           Name="Equals"
           StepOver="True" />
       </Item>
-      <Item>
-        <MethodInfo
-          DeclaringType="System.Object"
-          FullName="System.Object.InternalEquals"
-          IsInternal="True"
-          IsPrivate="False"
-          IsProtected="False"
-          IsPublic="False"
-          IsSpecialName="False"
-          IsStatic="True"
-          Module="mscorlib.dll"
-          Name="InternalEquals"
-          StepOver="True" />
-      </Item>
       <Item>
         <MethodInfo
           DeclaringType="System.Object"
@@ -482,20 +467,6 @@ namespace Debugger.Tests {
           Name="GetHashCode"
           StepOver="True" />
       </Item>
-      <Item>
-        <MethodInfo
-          DeclaringType="System.Object"
-          FullName="System.Object.InternalGetHashCode"
-          IsInternal="True"
-          IsPrivate="False"
-          IsProtected="False"
-          IsPublic="False"
-          IsSpecialName="False"
-          IsStatic="True"
-          Module="mscorlib.dll"
-          Name="InternalGetHashCode"
-          StepOver="True" />
-      </Item>
       <Item>
         <MethodInfo
           DeclaringType="System.Object"
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
index e67af62e1e..a27f69ee4d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/StackOverflow.cs
@@ -52,7 +52,7 @@ namespace Debugger.Tests {
     <ModuleLoaded>StackOverflow.exe (Has symbols)</ModuleLoaded>
     <DebuggingPaused>Break StackOverflow.cs:16,4-16,40</DebuggingPaused>
     <ExceptionThrown>Could not intercept: System.StackOverflowException</ExceptionThrown>
-    <DebuggingPaused>Exception StackOverflow.cs:21,3-21,4</DebuggingPaused>
+    <DebuggingPaused>Exception StackOverflow.cs:22,4-22,22</DebuggingPaused>
     <ProcessExited />
   </Test>
 </DebuggerTests>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
index 828640570c..455a2597e2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
@@ -26,7 +26,6 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
-		[NUnit.Framework.Ignore("Fails on .NET 4.0")]
 		public void ThreadName()
 		{
 			debugger.ProcessStarted += debugger_ProcessStarted;
@@ -112,6 +111,24 @@ namespace Debugger.Tests {
         SelectedStackFrame="Debugger.Tests.TestPrograms.ThreadName.Main"
         Suspended="False" />
     </Thread>
+    <ThreadStartedEvent>
+      <Thread
+        CurrentException="null"
+        CurrentExceptionIsUnhandled="False"
+        CurrentExceptionType="0"
+        HasExited="False"
+        IsAtSafePoint="True"
+        IsInValidState="True"
+        IsMostRecentStackFrameNative="False"
+        MostRecentStackFrame="System.Threading.ReaderWriterLock.Finalize"
+        MostRecentStackFrameWithLoadedSymbols="null"
+        Name=""
+        OldestStackFrame="System.Threading.ReaderWriterLock.Finalize"
+        Priority="Normal"
+        RuntimeValue="? = null"
+        SelectedStackFrame="null"
+        Suspended="False" />
+    </ThreadStartedEvent>
     <ProcessExited />
   </Test>
 </DebuggerTests>