From 533c70aa6857af290ad9aa55a8f503717ba9455c Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Laval?= <jeremie.laval@gmail.com>
Date: Thu, 22 Apr 2010 23:09:35 +0000
Subject: [PATCH] =?utf8?q?2010-04-23=20=20J=C3=A9r=C3=A9mie=20Laval=20=20<?=
 =?utf8?q?jeremie.laval@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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
---
 mcs/class/System.Core/Test/System.Linq/ChangeLog         | 5 +++++
 .../Test/System.Linq/ParallelEnumerableTests.cs          | 6 +++++-
 .../System.Core/Test/System.Linq/ParallelTestHelper.cs   | 2 +-
 .../BlockingCollectionTests.cs                           | 9 ++++++++-
 .../System/Test/System.Collections.Concurrent/ChangeLog  | 5 +++++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/mcs/class/System.Core/Test/System.Linq/ChangeLog b/mcs/class/System.Core/Test/System.Linq/ChangeLog
index d7d9d24c35c..a53f51058c4 100644
--- 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 9936ab3b700..ef543347905 100644
--- 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 3e804decbb7..eeeef86aedc 100644
--- 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 cfc942588e1..c9a5829a530 100644
--- 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 81387908bfe..1c8ce37a42f 100644
--- 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
-- 
2.25.1