code cleanup in XUnitConverter

src/XUnitConverter.Tests/AssertArgumentOrderTest.cs

@@ -1,20 +1,16 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
-
-using Microsoft.CodeAnalysis;
-
 using Xunit;
 
 namespace XUnitConverter.Tests
 {
     public class AssertArgumentOrderTest : ConverterTestBase
     {
-        protected override XUnitConverter.ConverterBase CreateConverter()
+        protected override ConverterBase CreateConverter()
         {
-            return new XUnitConverter.AssertArgumentOrderConverter();
+            return new AssertArgumentOrderConverter();
         }
 
         [Fact]

src/XUnitConverter.Tests/ConverterTestBase.cs

@@ -1,17 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Text;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Text;
 using Xunit;
-using XUnitConverter;
 
 namespace XUnitConverter.Tests
 {
@@ -39,10 +35,10 @@ private async Task<Project> RunConverter(Project project, bool runFormatter)
                 }
             }
 
-            return solution.GetProject(project.Id); ;
+            return solution.GetProject(project.Id);
         }
 
-        private Project CreateSolution(string source)
+        private static Project CreateSolution(string source)
         {
             var testProjectName = "Test";
             var projectId = ProjectId.CreateNewId(testProjectName);

src/XUnitConverter.Tests/MSTestToXUnitConverterTests.cs

@@ -1,24 +1,16 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Xunit;
-using System.Threading;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Text;
 
 namespace XUnitConverter.Tests
 {
     public class MSTestToXUnitConverterTests : ConverterTestBase
     {
-        protected override XUnitConverter.ConverterBase CreateConverter()
+        protected override ConverterBase CreateConverter()
         {
-            return new XUnitConverter.MSTestToXUnitConverter();
+            return new MSTestToXUnitConverter();
         }
 
         [Fact]

src/XUnitConverter.Tests/TestAssertTrueOrFalseConverterTests.cs

@@ -1,21 +1,16 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Xunit;
 
 namespace XUnitConverter.Tests
 {
     public class TestAssertTrueOrFalseConverterTests : ConverterTestBase
     {
-        protected override XUnitConverter.ConverterBase CreateConverter()
+        protected override ConverterBase CreateConverter()
         {
-            return new XUnitConverter.TestAssertTrueOrFalseConverter();
+            return new TestAssertTrueOrFalseConverter();
         }
 
         [Fact]

src/XUnitConverter/AssertArgumentOrderConverter.cs

@@ -128,11 +128,11 @@ private int IndexOfParameterWithName(IMethodSymbol symbol, HashSet<string> names
 
         protected override async Task<Solution> ProcessAsync(
             Document document,
-            SyntaxNode syntaxRoot,
+            SyntaxNode syntaxNode,
             CancellationToken cancellationToken)
         {
             var rewriter = new Rewriter(await document.GetSemanticModelAsync(cancellationToken));
-            var newNode = rewriter.Visit(syntaxRoot);
+            var newNode = rewriter.Visit(syntaxNode);
 
             return document.Project.Solution.WithDocumentSyntaxRoot(document.Id, newNode);
         }

src/XUnitConverter/ConverterBase.cs

@@ -1,13 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.CodeAnalysis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 
 namespace XUnitConverter
 {

src/XUnitConverter/MSTestToXUnitConverter.cs

@@ -3,23 +3,19 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System.Diagnostics;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CodeGeneration;
-using System.Runtime.Serialization;
-using System.IO;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace XUnitConverter
 {
     public sealed class MSTestToXUnitConverter : ConverterBase
     {
-        private static object s_lockObject = new object();
+        private static readonly object s_lockObject = new object();
         private static HashSet<string> s_mstestNamespaces;
 
         private static UsingDirectiveSyntax RemoveLeadingAndTrailingCompilerDirectives(UsingDirectiveSyntax usingSyntax)

src/XUnitConverter/Program.cs

@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.CodeAnalysis.MSBuild;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.MSBuild;
 
 namespace XUnitConverter
 {

src/XUnitConverter/TestAssertTrueOrFalseConverter.cs

@@ -1,11 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;