From f0a33c9d0c3c5f6e0fcd422d36d26160f45c2406 Mon Sep 17 00:00:00 2001
From: Jb Evain <jbevain@gmail.com>
Date: Wed, 19 May 2010 14:41:39 +0000
Subject: [PATCH] 2010-05-19  Jb Evain  <jbevain@novell.com>

	* EnumerableMoreTest.cs: add more GroupBy tests.


svn path=/trunk/mcs/; revision=157560
---
 .../System.Core/Test/System.Linq/ChangeLog    |  4 +++
 .../Test/System.Linq/EnumerableMoreTest.cs    | 31 +++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/mcs/class/System.Core/Test/System.Linq/ChangeLog b/mcs/class/System.Core/Test/System.Linq/ChangeLog
index 1829174222b..cd6ab0b75bb 100644
--- a/mcs/class/System.Core/Test/System.Linq/ChangeLog
+++ b/mcs/class/System.Core/Test/System.Linq/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-19  Jb Evain  <jbevain@novell.com>
+
+	* EnumerableMoreTest.cs: add more GroupBy tests.
+
 2010-04-29  Jérémie Laval  <jeremie.laval@gmail.com>
 
 	* ParallelEnumerableTests.cs: Add Ignore attribute instead of commenting test.
diff --git a/mcs/class/System.Core/Test/System.Linq/EnumerableMoreTest.cs b/mcs/class/System.Core/Test/System.Linq/EnumerableMoreTest.cs
index d0189534385..0cd94b1e766 100644
--- a/mcs/class/System.Core/Test/System.Linq/EnumerableMoreTest.cs
+++ b/mcs/class/System.Core/Test/System.Linq/EnumerableMoreTest.cs
@@ -1720,7 +1720,6 @@ namespace MonoTests.System.Linq {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void GroupByArgumentNullTest ()
 		{
 			string [] data = { "2", "1", "5", "3", "4" };
@@ -1768,7 +1767,6 @@ namespace MonoTests.System.Linq {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void GroupByTest ()
 		{
 			string [] data = { "2", "1", "5", "3", "4", "3" };
@@ -1814,6 +1812,35 @@ namespace MonoTests.System.Linq {
 			AssertAreSame (expected3, data.GroupBy (x => x, x => x, (x, y) => { foreach (var s in y) x += s; return x; }, EqualityComparer<string>.Default));
 		}
 
+
+		class Data {
+
+			public int Number;
+			public string String;
+
+			public Data (int number, string str)
+			{
+				Number = number;
+				String = str;
+			}
+		}
+
+		[Test]
+		public void GroupByLastNullGroup ()
+		{
+			var values = new List<Data> ();
+
+			values.Add (new Data (0, "a"));
+			values.Add (new Data (1, "a"));
+			values.Add (new Data (2, "b"));
+			values.Add (new Data (3, "b"));
+			values.Add (new Data (4, null));
+
+			var groups = values.GroupBy (d => d.String);
+
+			Assert.AreEqual (3, groups.Count ());
+		}
+
 		[Test]
 		public void ConcatArgumentNullTest ()
 		{
-- 
2.25.1