Merge pull request #59 from FiveTimesTheFun/master

"ConvertTests" rule improvements

Author: jaredpar

src/Microsoft.DotNet.CodeFormatting/Rules/UsesXunitForTestsFormattingRule.cs

@@ -32,6 +32,27 @@ internal UsesXunitForTestsFormattingRule(Options options)
             _options = options;
         }
 
+        private static UsingDirectiveSyntax RemoveLeadingAndTrailingCompilerDirectives(UsingDirectiveSyntax usingSyntax)
+        {
+            UsingDirectiveSyntax usingDirectiveToUse = usingSyntax;
+            if (usingDirectiveToUse.HasLeadingTrivia)
+            {
+                if (usingDirectiveToUse.HasLeadingTrivia)
+                {
+                    var newLeadingTrivia = RemoveCompilerDirectives(usingDirectiveToUse.GetLeadingTrivia());
+                    usingDirectiveToUse = usingDirectiveToUse.WithLeadingTrivia(newLeadingTrivia);
+                }
+                if (usingDirectiveToUse.HasTrailingTrivia)
+                {
+                    var newTrailingTrivia = RemoveCompilerDirectives(usingDirectiveToUse.GetTrailingTrivia());
+                    usingDirectiveToUse = usingDirectiveToUse.WithTrailingTrivia(newTrailingTrivia);
+                }
+            }
+
+            return usingDirectiveToUse;
+        }
+
+
         public async Task<Solution> ProcessAsync(Document document, SyntaxNode syntaxNode, CancellationToken cancellationToken)
         {
             var root = syntaxNode as CompilationUnitSyntax;
@@ -62,21 +83,13 @@ public async Task<Solution> ProcessAsync(Document document, SyntaxNode syntaxNod
                     }
                     else
                     {
-                        UsingDirectiveSyntax usingDirectiveToUse = usingSyntax;
-                        if (usingDirectiveToUse.HasLeadingTrivia)
-                        {
-                            var newLeadingTrivia = RemoveCompilerDirectives(usingDirectiveToUse.GetLeadingTrivia());
-                            usingDirectiveToUse = usingDirectiveToUse.WithLeadingTrivia(newLeadingTrivia);
-                        }
-                        if (usingDirectiveToUse.HasTrailingTrivia)
-                        {
-                            var newTrailingTrivia = RemoveCompilerDirectives(usingDirectiveToUse.GetTrailingTrivia());
-                            usingDirectiveToUse = usingDirectiveToUse.WithTrailingTrivia(newTrailingTrivia);
-                        }
-
-                        newUsings.Add(usingDirectiveToUse);
+                        newUsings.Add(RemoveLeadingAndTrailingCompilerDirectives(usingSyntax));
                     }
                 }
+                else
+                {
+                    newUsings.Add(RemoveLeadingAndTrailingCompilerDirectives(usingSyntax));
+                }
             }
 
             if (!needsChanges)
@@ -86,6 +99,7 @@ public async Task<Solution> ProcessAsync(Document document, SyntaxNode syntaxNod
 
             TransformationTracker transformationTracker = new TransformationTracker();
             RemoveTestClassAttributes(root, semanticModel, transformationTracker);
+            RemoveContractsRequiredAttributes(root, semanticModel, transformationTracker);
             ChangeTestMethodAttributesToFact(root, semanticModel, transformationTracker);
             ChangeAssertCalls(root, semanticModel, transformationTracker);
             root = transformationTracker.TransformRoot(root);
@@ -115,7 +129,17 @@ public async Task<Solution> ProcessAsync(Document document, SyntaxNode syntaxNod
             return document.WithSyntaxRoot(root).Project.Solution;
         }
 
+        private void RemoveContractsRequiredAttributes(CompilationUnitSyntax root, SemanticModel semanticModel, TransformationTracker transformationTracker)
+        {
+            RemoveTestAttributes(root, semanticModel, transformationTracker, "ContractsRequiredAttribute");
+        }
+
         private void RemoveTestClassAttributes(CompilationUnitSyntax root, SemanticModel semanticModel, TransformationTracker transformationTracker)
+        {
+            RemoveTestAttributes(root, semanticModel, transformationTracker, "TestClassAttribute");
+        }
+
+        private void RemoveTestAttributes(CompilationUnitSyntax root, SemanticModel semanticModel, TransformationTracker transformationTracker, string attributeName)
         {
             List<AttributeSyntax> nodesToRemove = new List<AttributeSyntax>();
 
@@ -127,7 +151,7 @@ private void RemoveTestClassAttributes(CompilationUnitSyntax root, SemanticModel
                     if (typeInfo.Type != null)
                     {
                         string attributeTypeDocID = typeInfo.Type.GetDocumentationCommentId();
-                        if (IsTestNamespaceType(attributeTypeDocID, "TestClassAttribute"))
+                        if (IsTestNamespaceType(attributeTypeDocID, attributeName))
                         {
                             return true;
                         }
@@ -156,6 +180,7 @@ private void RemoveTestClassAttributes(CompilationUnitSyntax root, SemanticModel
                 return transformationRoot;
             });
         }
+
         private void ChangeTestMethodAttributesToFact(CompilationUnitSyntax root, SemanticModel semanticModel, TransformationTracker transformationTracker)
         {
             List<AttributeSyntax> nodesToReplace = new List<AttributeSyntax>();