Waitany test debug and cleanup

13 files changed, 31 insertions, 37 deletions

diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.cs
index b55f8a0fde..46d43a85b6 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.cs
@@ -35,7 +35,7 @@ class WaitAnyEx
             Console.WriteLine("Waiting...");
             int i = WaitHandle.WaitAny(
                 new WaitHandle[]{myMutex,
-                new ManualResetEvent(false)}, 10000);
+                new ManualResetEvent(false)}, 30000);
             Console.WriteLine("WaitAny did not throw an " +
                 "exception, i = " + i);
         }
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.cs
index bb13264d4c..48e344f5c9 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.cs
@@ -78,10 +78,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexesWait()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
             else
                 ((ManualResetEvent)w).Set();
@@ -101,4 +100,4 @@ class WaitAnyEx
                 wh[i] = new ManualResetEvent(false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.cs
index b92f81985e..c3157d7e8a 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.cs
@@ -78,10 +78,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexesWait()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
             else
                 ((ManualResetEvent)w).Set();
@@ -101,4 +100,4 @@ class WaitAnyEx
                 wh[i] = new ManualResetEvent(false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.cs
index e1160c5e73..fe81733a27 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.cs
@@ -29,7 +29,7 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            int i = WaitHandle.WaitAny(wh, 10000);
+            int i = WaitHandle.WaitAny(wh, 30000);
             Console.WriteLine("WaitAny did not throw an " +
                 "exception, i = " + i);
         }
@@ -49,10 +49,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexes()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.cs
index f79cfa5cbf..da03f085c7 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.cs
@@ -49,10 +49,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexes()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
@@ -78,4 +77,4 @@ class WaitAnyEx
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.cs
index cdd75e5f19..6d73ec6836 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.cs
@@ -30,8 +30,8 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            i = WaitHandle.WaitAny(wh, 5000);
-            Console.WriteLine("WaitAny did not throw AbandonedMutexExcpetion");
+            i = WaitHandle.WaitAny(wh, 30000);
+            Console.WriteLine("WaitAny did not throw AbandonedMutexException. Result: {0}", i);
         }
         catch(AbandonedMutexException)
         {
@@ -49,11 +49,10 @@ class WaitAnyEx
 
     private void AbandonOneAndRelease()
     {
-        Mutex m = new Mutex();
         bool bSet = false;
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
             {
                 w.WaitOne();
                 if(bSet)
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.cs
index 16c4e50e61..b3d29fb1e6 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.cs
@@ -31,7 +31,7 @@ class WaitAnyEx
         {
             Console.WriteLine("Waiting...");
             i = WaitHandle.WaitAny(wh);
-            Console.WriteLine("WaitAny did not throw AbandonedMutexExcpetion");
+            Console.WriteLine("WaitAny did not throw AbandonedMutexException. Result: {0}", i);
         }
         catch(AbandonedMutexException)
         {
@@ -49,11 +49,10 @@ class WaitAnyEx
 
     private void AbandonOneAndRelease()
     {
-        Mutex m = new Mutex();
         bool bSet = false;
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
             {
                 w.WaitOne();
                 if(bSet)
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.cs
index 0f5b58658b..181e0c53ef 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.cs
@@ -55,13 +55,17 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            i = WaitHandle.WaitAny(wh, 5000);
             if(0 == iPosToAbandon)
-                Console.WriteLine("WaitAny didn't return an " +
-                    "AbandonedMutexException");
+            {
+                i = WaitHandle.WaitAny(wh, 30000);
+                Console.WriteLine("WaitAny did not throw AbandonedMutexException. Result: {0}", i);
+            }
             else
+            {
+                i = WaitHandle.WaitAny(wh, 10000);
                 // Expected to pass
                 iRet = 100;
+            }
         }
         catch(AbandonedMutexException)
         {
@@ -94,4 +98,4 @@ class WaitAnyEx
             wh[i] = new Mutex(false, Common.GetUniqueName());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.cs
index cc3108d0f2..74e56be146 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.cs
@@ -28,7 +28,7 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            int i = WaitHandle.WaitAny(wh, 10000);
+            int i = WaitHandle.WaitAny(wh, 30000);
             Console.WriteLine("WaitAny did not throw an " +
                 "exception, i = " + i);
         }
@@ -48,10 +48,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexes()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.cs
index 903b83c372..736ce14fca 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.cs
@@ -48,10 +48,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexes()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.cs
index 358ae5162b..22398358ce 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.cs
@@ -34,7 +34,7 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            int i = WaitHandle.WaitAny(wh, 5000);
+            int i = WaitHandle.WaitAny(wh, 30000);
             Console.WriteLine("WaitAny did not throw an " +
                 "exception, i = " + i);
         }
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.cs
index 76b3006829..7af91355a4 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.cs
@@ -58,7 +58,7 @@ class WaitAnyEx
         try
         {
             Console.WriteLine("Waiting...");
-            int i = WaitHandle.WaitAny(wh, 10000);
+            int i = WaitHandle.WaitAny(wh, 30000);
             Console.WriteLine("WaitAny did not throw an " +
                 "exception, i = " + i);
         }
@@ -78,10 +78,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexesWait()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
@@ -99,4 +98,4 @@ class WaitAnyEx
                 wh[i] = new ManualResetEvent(false);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.cs b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.cs
index 1c5817f9e0..38637a9779 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.cs
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.cs
@@ -78,10 +78,9 @@ class WaitAnyEx
 
     private void AbandonAllMutexesWait()
     {
-        Mutex m = new Mutex();
         foreach(WaitHandle w in wh)
         {
-            if(w.GetType() == m.GetType())
+            if(w is Mutex)
                 w.WaitOne();
         }
         myMRE.Set();
@@ -99,4 +98,4 @@ class WaitAnyEx
                 wh[i] = new ManualResetEvent(false);
         }
     }
-}
\ No newline at end of file
+}