Merge pull request #2683 from stephentoub/plinq_outer_loop

Fix outer loop PLINQ tests faiing to find member data

Author: stephentoub

src/System.Linq.Parallel/tests/DegreeOfParallelismTests.cs

@@ -16,15 +16,15 @@ public class DegreeOfParallelismTests
         // If ThreadPool becomes available, uncomment the below
         //private static ThreadPoolManager _poolManager = new ThreadPoolManager();
 
-        public static IEnumerable<object[]> DegreeData(object[] counts, object[] degrees)
+        public static IEnumerable<object[]> DegreeData(int[] counts, int[] degrees)
         {
             foreach (object[] results in UnorderedSources.Ranges(counts.Cast<int>(), x => degrees.Cast<int>().DefaultIfEmpty(x)))
             {
                 yield return results;
             }
         }
 
-        public static IEnumerable<object[]> NotLoadBalancedDegreeData(object[] counts, object[] degrees)
+        public static IEnumerable<object[]> NotLoadBalancedDegreeData(int[] counts, int[] degrees)
         {
             foreach (object[] results in DegreeData(counts, degrees))
             {
@@ -53,7 +53,7 @@ public static void DegreeOfParallelism(Labeled<ParallelQuery<int>> labeled, int
         }
 
         [Theory]
-        [MemberData("DegreeData", new[] { 1, 4, 32 }, new object[] { })]
+        [MemberData("DegreeData", new[] { 1, 4, 32 }, new int[] { })]
         [OuterLoop]
         public static void DegreeOfParallelism_Barrier(Labeled<ParallelQuery<int>> labeled, int count, int degree)
         {
@@ -79,7 +79,7 @@ public static void DegreeOfParallelism_Pipelining(Labeled<ParallelQuery<int>> la
         }
 
         [Theory]
-        [MemberData("DegreeData", new[] { 1, 4 }, new object[] { })]
+        [MemberData("DegreeData", new[] { 1, 4 }, new int[] { })]
         [MemberData("DegreeData", new[] { 32 }, new[] { 4 })]
         // Without the ability to ask the thread pool to create a minimum number of threads ahead of time,
         // higher thread counts take a prohibitive amount of time spooling them up.
@@ -100,7 +100,7 @@ public static void DegreeOfParallelism_Throttled_Pipelining(Labeled<ParallelQuer
         }
 
         [Theory]
-        [MemberData("NotLoadBalancedDegreeData", new[] { 1, 4 }, new object[] { })]
+        [MemberData("NotLoadBalancedDegreeData", new[] { 1, 4 }, new int[] { })]
         [MemberData("NotLoadBalancedDegreeData", new[] { 32, 512, 1024 }, new[] { 4, 16 })]
         [OuterLoop]
         public static void DegreeOfParallelism_Aggregate_Accumulator(Labeled<ParallelQuery<int>> labeled, int count, int degree)
@@ -118,7 +118,7 @@ public static void DegreeOfParallelism_Aggregate_Accumulator(Labeled<ParallelQue
         }
 
         [Theory]
-        [MemberData("NotLoadBalancedDegreeData", new[] { 1, 4 }, new object[] { })]
+        [MemberData("NotLoadBalancedDegreeData", new[] { 1, 4 }, new int[] { })]
         [MemberData("NotLoadBalancedDegreeData", new[] { 32, 512, 1024 }, new[] { 4, 16 })]
         [OuterLoop]
         public static void DegreeOfParallelism_Aggregate_SeedFunction(Labeled<ParallelQuery<int>> labeled, int count, int degree)