2010-04-23 Jérémie Laval <jeremie.laval@gmail.com>

In class/System.Core/Test/System.Linq/:
   * ParallelEnumerableTests.cs: Fix namespace, add NET_4_0 #ifdef
   * ParallelTestHelper.cs: Fix namespace

In class/System/Test/System.Collections.Concurrent/:
   * BlockingCollectionTests.cs: Add IsCompletedEmptyTestCase,
   fix namespace

svn path=/trunk/mcs/; revision=155968

diff --git a/mcs/class/System.Core/Test/System.Linq/ChangeLog b/mcs/class/System.Core/Test/System.Linq/ChangeLog
index d7d9d24c35ccda19ae05b7ad68b6945d508b5ac2..a53f51058c4934256999405ee985ead904fb2443 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/ChangeLog
+++ b/mcs/class/System.Core/Test/System.Linq/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * ParallelEnumerableTests.cs: Fix namespace, add NET_4_0 #ifdef
+       * ParallelTestHelper.cs: Fix namespace
+
 2010-04-15  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * ParallelEnumerableTests.cs: Tweak Skip unit test to avoid deadlocking for now

diff --git a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
index 9936ab3b7007febc9c309abb4832820a32c3e2e7..ef543347905817cf6556456f3a750c6f73d571e9 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
+++ b/mcs/class/System.Core/Test/System.Linq/ParallelEnumerableTests.cs
@@ -24,6 +24,8 @@
 //
 //
 
+#if NET_4_0
+
 using System;
 using System.Threading;
 using System.Linq;
@@ -33,7 +35,7 @@ using System.Collections.Generic;
 
 using NUnit.Framework;
 
-namespace MonoTests.System.Linq.Parallel
+namespace MonoTests.System.Linq
 {
        [TestFixtureAttribute]
        public class ParallelEnumerableTests
@@ -741,3 +743,5 @@ namespace MonoTests.System.Linq.Parallel
                }
        }
 }
+
+#endif

diff --git a/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs b/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
index 3e804decbb757f3ed65ed768c9a04db6d83c21b1..eeeef86aedc6d14adfa568dcde8c72862fe45fc8 100644 (file)
--- a/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
+++ b/mcs/class/System.Core/Test/System.Linq/ParallelTestHelper.cs
@@ -27,7 +27,7 @@ using System;
 using System.Threading;
 using System.Collections.Concurrent;
 
-namespace MonoTests.System.Linq.Parallel
+namespace MonoTests.System.Linq
 {
        public static class ParallelTestHelper
        {

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
index cfc942588e1f4489f02db6f80f8ce85361386a41..c9a5829a530d9895589c4c404050dfde73b9e970 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
+++ b/mcs/class/System/Test/System.Collections.Concurrent/BlockingCollectionTests.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 
 using NUnit.Framework;
 
-namespace ParallelFxTests
+namespace MonoTests.System.Collections.Concurrent
 {
        [TestFixture()]
        public class BlockingCollectionTests
@@ -139,6 +139,13 @@ namespace ParallelFxTests
                        Assert.IsTrue(defaultCollection.IsCompleted, "#4");
                }
                
+               [TestAttribute]
+               public void IsCompletedEmptyTestCase ()
+               {
+                       defaultCollection.CompleteAdding ();
+                       Assert.IsTrue (defaultCollection.IsCompleted);
+               }
+
                [TestAttribute]
                public void ConsumingEnumerableTestCase()
                {

diff --git a/mcs/class/System/Test/System.Collections.Concurrent/ChangeLog b/mcs/class/System/Test/System.Collections.Concurrent/ChangeLog
index 81387908bfe1ad0eccc266be9f261ed229db2c04..1c8ce37a42fad05394fa669b06e79ed1d8abe3c6 100644 (file)
--- a/mcs/class/System/Test/System.Collections.Concurrent/ChangeLog
+++ b/mcs/class/System/Test/System.Collections.Concurrent/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-23  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * BlockingCollectionTests.cs: Add IsCompletedEmptyTestCase,
+       fix namespace name
+
 2009-08-19 Jérémie Laval  <jeremie.laval@gmail.com>
 
        * BlockingCollectionTests.cs: track API changes