Fix build break from mismerge

OmniSharp · Jun 5, 2018 · ea3d151 · ea3d151
1 parent 1ed39fc
commit ea3d151
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/tests/OmniSharp.DotNetTest.Tests/AbstractTestFixture.cs b/tests/OmniSharp.DotNetTest.Tests/AbstractTestFixture.cs
@@ -11,12 +11,12 @@ public abstract class AbstractTestFixture : TestUtility.AbstractTestFixture
             ["DotNet:Enabled"] = "true"
         };
 
-        protected const string LegacyXunitTestProject = "LegacyXunitTestProject";
-        protected const string LegacyNunitTestProject = "LegacyNUnitTestProject";
-        protected const string LegacyMSTestProject = "LegacyMSTestProject";
-        protected const string XunitTestProject = "XunitTestProject";
-        protected const string NUnitTestProject = "NUnitTestProject";
-        protected const string MSTestProject = "MSTestProject";
+        protected const string LegacyXunitTestProject = nameof(LegacyXunitTestProject);
+        protected const string LegacyNUnitTestProject = nameof(LegacyNUnitTestProject);
+        protected const string LegacyMSTestProject = nameof(LegacyMSTestProject);
+        protected const string XunitTestProject = nameof(XunitTestProject);
+        protected const string NUnitTestProject = nameof(NUnitTestProject);
+        protected const string MSTestProject = nameof(MSTestProject);
 
         protected AbstractTestFixture(ITestOutputHelper output)
             : base(output)

diff --git a/tests/OmniSharp.DotNetTest.Tests/LegacyGetTestStartInfoFacts.cs b/tests/OmniSharp.DotNetTest.Tests/LegacyGetTestStartInfoFacts.cs
@@ -26,7 +26,7 @@ await GetDotNetTestStartInfoAsync(
         public async Task RunNunitTest()
         {
             await GetDotNetTestStartInfoAsync(
-                LegacyNunitTestProject,
+                LegacyNUnitTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "nunit");
         }

diff --git a/tests/OmniSharp.DotNetTest.Tests/LegacyRunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/LegacyRunTestFacts.cs
@@ -51,7 +51,7 @@ await RunDotNetTestAsync(
         public async Task RunNunitTest()
         {
             await RunDotNetTestAsync(
-                LegacyNunitTestProject,
+                LegacyNUnitTestProject,
                 methodName: "Main.Test.MainTest.Test",
                 testFramework: "nunit",
                 shouldPass: true);
@@ -61,7 +61,7 @@ await RunDotNetTestAsync(
         public async Task RunNunitDataDriveTest1()
         {
             await RunDotNetTestAsync(
-                LegacyNunitTestProject,
+                LegacyNUnitTestProject,
                 methodName: "Main.Test.MainTest.DataDrivenTest1",
                 testFramework: "nunit",
                 shouldPass: false);
@@ -71,7 +71,7 @@ await RunDotNetTestAsync(
         public async Task RunNunitDataDriveTest2()
         {
             await RunDotNetTestAsync(
-                LegacyNunitTestProject,
+                LegacyNUnitTestProject,
                 methodName: "Main.Test.MainTest.DataDrivenTest2",
                 testFramework: "nunit",
                 shouldPass: true);
@@ -81,7 +81,7 @@ await RunDotNetTestAsync(
         public async Task RunNunitSourceDataDrivenTest()
         {
             await RunDotNetTestAsync(
-                LegacyNunitTestProject,
+                LegacyNUnitTestProject,
                 methodName: "Main.Test.MainTest.SourceDataDrivenTest",
                 testFramework: "nunit",
                 shouldPass: true);

diff --git a/tests/OmniSharp.DotNetTest.Tests/TestDiscoveryFacts.cs b/tests/OmniSharp.DotNetTest.Tests/TestDiscoveryFacts.cs
@@ -13,14 +13,10 @@ namespace OmniSharp.DotNetTest.Tests
     public class TestDiscoveryFacts : AbstractTestFixture
     {
         private const string xunit = nameof(xunit);
-        private const string LegacyXunitTestProject = nameof(LegacyXunitTestProject);
         private const string XunitTestMethod = "XunitTestMethod";
-        private const string XunitTestProject = nameof(XunitTestProject);
 
         private const string nunit = nameof(nunit);
-        private const string LegacyNUnitTestProject = "LegacyNUnitTestProject";
         private const string NUnitTestMethod = "NUnitTestMethod";
-        private const string NUnitTestProject = nameof(NUnitTestProject);
 
         private const string TestProgram = "TestProgram.cs";