implemented ConditionalOuterLoopAttribute, which conditionally sets OuterLoop category

Author: pavelsavara

src/Microsoft.DotNet.XUnitExtensions/src/Attributes/ConditionalOuterLoopAttribute.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Xunit.Sdk;
+
+namespace Xunit
+{
+    /// <summary>
+    /// Apply this attribute to your test method to specify a outer-loop category.
+    /// </summary>
+    [TraitDiscoverer("Microsoft.DotNet.XUnitExtensions.ConditionalOuterLoopTestsDiscoverer", "Microsoft.DotNet.XUnitExtensions")]
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
+    public class ConditionalOuterLoopAttribute : Attribute, ITraitAttribute
+    {
+        public Type CalleeType { get; private set; }
+        public string[] ConditionMemberNames { get; private set; }
+
+        public ConditionalOuterLoopAttribute(string reason, TestPlatforms platforms) { }
+        public ConditionalOuterLoopAttribute(string reason, TargetFrameworkMonikers framework) { }
+        public ConditionalOuterLoopAttribute(string reason, TestRuntimes runtimes) { }
+        public ConditionalOuterLoopAttribute(string reason, TestPlatforms platforms = TestPlatforms.Any, TargetFrameworkMonikers framework = TargetFrameworkMonikers.Any, TestRuntimes runtimes = TestRuntimes.Any) { }
+        public ConditionalOuterLoopAttribute(string isreasonsue, Type calleeType, params string[] conditionMemberNames)
+        {
+            CalleeType = calleeType;
+            ConditionMemberNames = conditionMemberNames;
+        }
+    }
+}

src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using Xunit;
 
@@ -59,5 +58,54 @@ internal static bool Evaluate(Type calleeType, string[] conditionMemberNames)
 
             return true;
         }
+
+        internal static IEnumerable<KeyValuePair<string, string>> EvaluateArguments(IEnumerable<object> ctorArgs,string category, int skipFirst=1)
+        {
+            Debug.Assert(ctorArgs.Count() >= 2);
+
+            TestPlatforms platforms = TestPlatforms.Any;
+            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
+            TestRuntimes runtimes = TestRuntimes.Any;
+            Type calleeType = null;
+            string[] conditionMemberNames = null;
+            
+            foreach (object arg in ctorArgs.Skip(skipFirst)) // First argument is the issue number or reason.
+            {
+                if (arg is TestPlatforms)
+                {
+                    platforms = (TestPlatforms)arg;
+                }
+                else if (arg is TargetFrameworkMonikers)
+                {
+                    frameworks = (TargetFrameworkMonikers)arg;
+                }
+                else if (arg is TestRuntimes)
+                {
+                    runtimes = (TestRuntimes)arg;
+                }
+                else if (arg is Type)
+                {
+                    calleeType = (Type)arg;
+                }
+                else if (arg is string[])
+                {
+                    conditionMemberNames = (string[])arg;
+                }
+            }
+
+            if (calleeType != null && conditionMemberNames != null)
+            {
+                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
+                {
+                    yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+                }
+            }
+            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
+                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
+                DiscovererHelpers.TestFrameworkApplies(frameworks))
+            {
+                yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+            }
+        }        
     }
 }

src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs

@@ -1,11 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -25,52 +21,7 @@ public class ActiveIssueDiscoverer : ITraitDiscoverer
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
             IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
-            Debug.Assert(ctorArgs.Count() >= 2);
-
-            string issue = ctorArgs.First().ToString();
-            TestPlatforms platforms = TestPlatforms.Any;
-            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
-            TestRuntimes runtimes = TestRuntimes.Any;
-            Type calleeType = null;
-            string[] conditionMemberNames = null;
-            
-            foreach (object arg in ctorArgs.Skip(1)) // First argument is the issue number.
-            {
-                if (arg is TestPlatforms)
-                {
-                    platforms = (TestPlatforms)arg;
-                }
-                else if (arg is TargetFrameworkMonikers)
-                {
-                    frameworks = (TargetFrameworkMonikers)arg;
-                }
-                else if (arg is TestRuntimes)
-                {
-                    runtimes = (TestRuntimes)arg;
-                }
-                else if (arg is Type)
-                {
-                    calleeType = (Type)arg;
-                }
-                else if (arg is string[])
-                {
-                    conditionMemberNames = (string[])arg;
-                }
-            }
-
-            if (calleeType != null && conditionMemberNames != null)
-            {
-                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
-                {
-                    yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-                }
-            }
-            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
-                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
-                DiscovererHelpers.TestFrameworkApplies(frameworks))
-            {
-                yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.Failing);
         }
     }
 }

src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ConditionalOuterLoopTestsDiscoverer.cs

@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+using System.Linq;
+
+namespace Microsoft.DotNet.XUnitExtensions
+{
+    /// <summary>
+    /// This class discovers all of the tests and test classes that have
+    /// applied the OuterLoop attribute
+    /// </summary>
+    public class ConditionalOuterLoopTestsDiscoverer : ITraitDiscoverer
+    {
+        /// <summary>
+        /// Gets the trait values from the Category attribute.
+        /// </summary>
+        /// <param name="traitAttribute">The trait attribute containing the trait values.</param>
+        /// <returns>The trait values.</returns>
+        public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
+        {
+            IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
+            if (ctorArgs.Count() <= 2)
+            {
+                return new[] { new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.OuterLoop) };
+            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.OuterLoop);
+        }
+    }
+}

src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs

@@ -13,6 +13,7 @@ public class ConditionalAttributeTests
         // This test class is test order dependent so do not rename the tests.
         // If new tests need to be added, follow the same naming pattern ConditionalAttribute{LetterToOrderTest} and then add a Validate{TestName}.
 
+        private static bool s_conditionalOuterLoop;
         private static bool s_conditionalFactExecuted;
         private static int s_conditionalTheoryCount;
 
@@ -24,6 +25,13 @@ public void ConditionalAttributeA()
             s_conditionalFactExecuted = true;
         }
 
+        [Fact]
+        [ConditionalOuterLoop("never outer loop", TestPlatforms.Any & ~TestPlatforms.Any)]
+        public void ConditionalOuterLoopAttribute()
+        {
+            s_conditionalOuterLoop = true;
+        }
+
         [ConditionalTheory(nameof(AlwaysTrue))]
         [InlineData(1)]
         [InlineData(2)]
@@ -41,6 +49,12 @@ public void ValidateConditionalFact()
             Assert.True(s_conditionalFactExecuted);
         }
 
+        [Fact]
+        public void ValidateConditionalOuterLoop()
+        {
+            Assert.True(s_conditionalOuterLoop);
+        }
+
         [Fact]
         public void ValidateConditionalTheory()
         {