Put TestOrderExamples classes in namespace to clarify the need for FQDN

Author: bradwilson

TestOrderExamples/TestCaseOrdering/AlphabeticalOrderExample.cs

@@ -1,6 +1,6 @@
 using Xunit;
 
-[TestCaseOrderer("AlphabeticalOrderer", "TestOrderExamples")]
+[TestCaseOrderer("TestOrderExamples.TestCaseOrdering.AlphabeticalOrderer", "TestOrderExamples")]
 public class AlphabeticalOrderExample
 {
     public static bool Test1Called;

TestOrderExamples/TestCaseOrdering/AlphabeticalOrderer.cs

@@ -4,13 +4,16 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-public class AlphabeticalOrderer : ITestCaseOrderer 
+namespace TestOrderExamples.TestCaseOrdering
 {
-    public IEnumerable<TTestCase> OrderTestCases<TTestCase>(IEnumerable<TTestCase> testCases)
-            where TTestCase : ITestCase
+    public class AlphabeticalOrderer : ITestCaseOrderer
     {
-        var result = testCases.ToList();
-        result.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.Method.Name, y.TestMethod.Method.Name));
-        return result;
+        public IEnumerable<TTestCase> OrderTestCases<TTestCase>(IEnumerable<TTestCase> testCases)
+                where TTestCase : ITestCase
+        {
+            var result = testCases.ToList();
+            result.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.Method.Name, y.TestMethod.Method.Name));
+            return result;
+        }
     }
 }

TestOrderExamples/TestCaseOrdering/PriorityOrderExamples.cs

@@ -1,7 +1,7 @@
 using Xunit;
 
-[TestCaseOrderer("PriorityOrderer", "TestOrderExamples")]
-public class PriorityOrderExample
+[TestCaseOrderer("TestOrderExamples.TestCaseOrdering.PriorityOrderer", "TestOrderExamples")]
+public class PriorityOrderExamples
 {
     public static bool Test1Called;
     public static bool Test2ACalled;

TestOrderExamples/TestCaseOrdering/PriorityOrderer.cs

@@ -4,39 +4,42 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-public class PriorityOrderer : ITestCaseOrderer
+namespace TestOrderExamples.TestCaseOrdering
 {
-    public IEnumerable<TTestCase> OrderTestCases<TTestCase>(IEnumerable<TTestCase> testCases) where TTestCase : ITestCase
+    public class PriorityOrderer : ITestCaseOrderer
     {
-        var sortedMethods = new SortedDictionary<int, List<TTestCase>>();
-
-        foreach (TTestCase testCase in testCases)
+        public IEnumerable<TTestCase> OrderTestCases<TTestCase>(IEnumerable<TTestCase> testCases) where TTestCase : ITestCase
         {
-            int priority = 0;
+            var sortedMethods = new SortedDictionary<int, List<TTestCase>>();
+
+            foreach (TTestCase testCase in testCases)
+            {
+                int priority = 0;
 
-            foreach (IAttributeInfo attr in testCase.TestMethod.Method.GetCustomAttributes((typeof (TestPriorityAttribute).AssemblyQualifiedName)))
-                priority = attr.GetNamedArgument<int>("Priority");
+                foreach (IAttributeInfo attr in testCase.TestMethod.Method.GetCustomAttributes((typeof(TestPriorityAttribute).AssemblyQualifiedName)))
+                    priority = attr.GetNamedArgument<int>("Priority");
 
-            GetOrCreate(sortedMethods, priority).Add(testCase);
+                GetOrCreate(sortedMethods, priority).Add(testCase);
+            }
+
+            foreach (var list in sortedMethods.Keys.Select(priority => sortedMethods[priority]))
+            {
+                list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.Method.Name, y.TestMethod.Method.Name));
+                foreach (TTestCase testCase in list)
+                    yield return testCase;
+            }
         }
 
-        foreach (var list in sortedMethods.Keys.Select(priority => sortedMethods[priority]))
+        static TValue GetOrCreate<TKey, TValue>(IDictionary<TKey, TValue> dictionary, TKey key) where TValue : new()
         {
-            list.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.TestMethod.Method.Name, y.TestMethod.Method.Name));
-            foreach (TTestCase testCase in list)
-                yield return testCase;
-        }
-    }
+            TValue result;
 
-    static TValue GetOrCreate<TKey, TValue>(IDictionary<TKey, TValue> dictionary, TKey key) where TValue : new()
-    {
-        TValue result;
+            if (dictionary.TryGetValue(key, out result)) return result;
 
-        if (dictionary.TryGetValue(key, out result)) return result;
-        
-        result = new TValue();
-        dictionary[key] = result;
+            result = new TValue();
+            dictionary[key] = result;
 
-        return result;
+            return result;
+        }
     }
-}
+}

TestOrderExamples/TestCollectionOrdering/DisplayNameOrderExample.cs

@@ -1,7 +1,7 @@
 using Xunit;
 
 // Set the orderer
-[assembly: TestCollectionOrderer("DisplayNameOrderer", "TestOrderExamples")]
+[assembly: TestCollectionOrderer("TestOrderExamples.TestCollectionOrdering.DisplayNameOrderer", "TestOrderExamples")]
 
 // Need to turn off test parallelization so we can validate the run order
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

TestOrderExamples/TestCollectionOrdering/DisplayNameOrderer.cs

@@ -3,10 +3,13 @@
 using Xunit;
 using Xunit.Abstractions;
 
-public class DisplayNameOrderer : ITestCollectionOrderer
+namespace TestOrderExamples.TestCollectionOrdering
 {
-    public IEnumerable<ITestCollection> OrderTestCollections(IEnumerable<ITestCollection> testCollections)
+    public class DisplayNameOrderer : ITestCollectionOrderer
     {
-        return testCollections.OrderBy(collection => collection.DisplayName);
+        public IEnumerable<ITestCollection> OrderTestCollections(IEnumerable<ITestCollection> testCollections)
+        {
+            return testCollections.OrderBy(collection => collection.DisplayName);
+        }
     }
 }