New test.

[mono.git] / mcs / class / corlib / Test / System.Collections.Concurrent / ConcurrentDictionaryTests.cs

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
index 17aa4ccfe1d82287b5036de033fdcd974fcfeb32..4f1ad64ce2f2af1628dcae9fd7be5773de7ac1b2 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
@@ -31,7 +31,7 @@ using System.Collections.Concurrent;
 using NUnit;
 using NUnit.Framework;
 
-namespace ParallelFxTests
+namespace MonoTests.System.Collections.Concurrent
 {
        [TestFixture]
        public class ConcurrentDictionaryTests
@@ -47,7 +47,7 @@ namespace ParallelFxTests
                
                void AddStuff ()
                {
-                 map.TryAdd ("foo", 1);
+                       map.TryAdd ("foo", 1);
                        map.TryAdd ("bar", 2);
                        map.TryAdd ("foobar", 3);
                }
@@ -75,22 +75,23 @@ namespace ParallelFxTests
                                        int own = Interlocked.Increment (ref index);
                                        
                                        while (!map.TryAdd ("monkey" + own.ToString (), 3));
+                                       
                                }, 4);
                                
                                Assert.AreEqual (7, map.Count);
                                int value;
                                
                                Assert.IsTrue (map.TryGetValue ("monkey1", out value), "#1");
-                               Assert.AreEqual (3, value, "#1");
+                               Assert.AreEqual (3, value, "#1b");
                                
                                Assert.IsTrue (map.TryGetValue ("monkey2", out value), "#2");
-                               Assert.AreEqual (3, value, "#2");
+                               Assert.AreEqual (3, value, "#2b");
                                
                                Assert.IsTrue (map.TryGetValue ("monkey3", out value), "#3");
-                               Assert.AreEqual (3, value, "#3");
+                               Assert.AreEqual (3, value, "#3b");
                                
                                Assert.IsTrue (map.TryGetValue ("monkey4", out value), "#4");
-                               Assert.AreEqual (3, value, "#4");
+                               Assert.AreEqual (3, value, "#4b");
                        });
                }
                
@@ -131,16 +132,16 @@ namespace ParallelFxTests
                        });
                }
                
-               [Test, ExpectedException(typeof(ArgumentException))]
+               [Test]
                public void AddWithDuplicate()
                {
-                       map.TryAdd("foo", 6);
+                       Assert.IsFalse (map.TryAdd("foo", 6));
                }
                
                [Test]
                public void GetValueTest()
                {
-                 Assert.AreEqual(1, map["foo"], "#1");
+                       Assert.AreEqual(1, map["foo"], "#1");
                        Assert.AreEqual(2, map["bar"], "#2");
                        Assert.AreEqual(3, map.Count, "#3");
                }