Fix Tests

A couple tests were broken due to being out of sync with source changes.

The Xunit update split the Xunit API into two different assemblies (Core and Assert): make sure both are referenced.

Author: ericstj

src/Microsoft.DotNet.CodeFormatting.Tests/Rules/CombinationTest.cs

@@ -353,6 +353,8 @@ public void RequiredRuntimeAttribute()
     }
 }";
 
+            // Using location rule is off by default.
+            ToggleRule(UsingLocationRule.Name, enabled: true);
             Verify(source, expected);
         }
     }

src/Microsoft.DotNet.CodeFormatting.Tests/Rules/ExplicitVisibilityRuleTests.cs

@@ -559,7 +559,7 @@ private unsafe C(int p1, int p2) { }
             public void CommentAttributeAndMultipleField()
             {
                 var text = @"
-class C 
+class C
 {
     // Hello
     [Attr]
@@ -568,7 +568,7 @@ class C
 };";
 
                 var expected = @"
-internal class C 
+internal class C
 {
     // Hello
     [Attr]

src/Microsoft.DotNet.CodeFormatting.Tests/Rules/PrivateFieldNamingRuleTests.cs

@@ -44,10 +44,8 @@ class T
     // some trivia
     private int _k = 1, _s = 2, _rsk_yz = 3, _y_z;
     // some trivia
-    [ThreadStatic]
-    static int t_r;
-    [ThreadStaticAttribute]
-    static int t_r;
+    [ThreadStatic] static int t_r;
+    [ThreadStaticAttribute] static int t_r;
 }";
                 Verify(text, expected);
             }

src/XUnitConverter.Tests/ConverterTestBase.cs

@@ -5,14 +5,10 @@
 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 Xunit;
-using XUnitConverter;
 
 namespace XUnitConverter.Tests
 {
@@ -21,7 +17,8 @@ public abstract class ConverterTestBase
         private static readonly MetadataReference s_CorlibReference = MetadataReference.CreateFromFile(typeof(object).Assembly.Location);
         private static readonly MetadataReference s_SystemCoreReference = MetadataReference.CreateFromFile(typeof(Enumerable).Assembly.Location);
         private static readonly MetadataReference s_MSTestReference = MetadataReference.CreateFromFile(typeof(Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute).Assembly.Location);
-        private static readonly MetadataReference s_XunitReference = MetadataReference.CreateFromFile(typeof(FactAttribute).Assembly.Location);
+        private static readonly MetadataReference s_XunitCoreReference = MetadataReference.CreateFromFile(typeof(Xunit.FactAttribute).Assembly.Location);
+        private static readonly MetadataReference s_XunitAssertReference = MetadataReference.CreateFromFile(typeof(Xunit.Assert).Assembly.Location);
 
         protected abstract ConverterBase CreateConverter();
 
@@ -53,7 +50,8 @@ private Project CreateSolution(string source)
                     s_CorlibReference,
                     s_SystemCoreReference,
                     s_MSTestReference,
-                    s_XunitReference
+                    s_XunitCoreReference,
+                    s_XunitAssertReference
                 };
 
             var solution = new AdhocWorkspace()

src/XUnitConverter.Tests/XUnitConverter.Tests.csproj

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\XUnitConverter\XUnitConverter.csproj" />
-    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />    
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="Microsoft.VisualStudio.TestPlatform" Version="14.0.0.1" />
   </ItemGroup>