Try to make it easier to add new kinds of tests.

7 files changed, 14 insertions, 13 deletions

diff --git a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
index 4982d733..edd8536b 100644
--- a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
+++ b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class BasicFunctionalityTests : BurnE2ETests
     {
-        public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "BasicFunctionality") { }
+        public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle()
diff --git a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
index 7643cc64..55353277 100644
--- a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+++ b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
@@ -10,7 +10,7 @@ namespace WixToolsetTest.BurnE2E
     [Collection("BurnE2E")]
     public abstract class BurnE2ETests : WixTestBase, IDisposable
     {
-        protected BurnE2ETests(ITestOutputHelper testOutputHelper, string testGroupName) : base(testOutputHelper, testGroupName) { }
+        protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         private Queue<IDisposable> Installers { get; } = new Queue<IDisposable>();
 
diff --git a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
index 53ed1fd2..6d8f1536 100644
--- a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
+++ b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class MsiTransactionTests : BurnE2ETests
     {
-        public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "MsiTransaction") { }
+        public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [Fact]
         public void CanUpgradeBundleWithMsiTransaction()
diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
index c10736b1..ced2e08e 100644
--- a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
+++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class PrereqBaTests : BurnE2ETests
     {
-        public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "PrereqBa") { }
+        public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         /// <summary>
         /// This bundle purposely provides a .runtimeconfig.json file that requires a version of .NET Core that doesn't exist,
diff --git a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
index 1ae81b49..effe4418 100644
--- a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
+++ b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
 
     public class RollbackBoundaryTests : BurnE2ETests
     {
-        public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "RollbackBoundary") { }
+        public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         /// <summary>
         /// Installs 1 bundle:
diff --git a/src/WixToolsetTest.BurnE2E/WixTestBase.cs b/src/WixToolsetTest.BurnE2E/WixTestBase.cs
index a7fd752f..650b0681 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestBase.cs
+++ b/src/WixToolsetTest.BurnE2E/WixTestBase.cs
@@ -2,15 +2,13 @@
 
 namespace WixToolsetTest.BurnE2E
 {
-    using System;
-    using System.IO;
     using Xunit.Abstractions;
 
     public abstract class WixTestBase
     {
-        protected WixTestBase(ITestOutputHelper testOutputHelper, string testGroupName)
+        protected WixTestBase(ITestOutputHelper testOutputHelper)
         {
-            this.TestContext = new WixTestContext(testOutputHelper, testGroupName);
+            this.TestContext = new WixTestContext(testOutputHelper);
         }
 
         /// <summary>
diff --git a/src/WixToolsetTest.BurnE2E/WixTestContext.cs b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
index 97856089..5620c6a7 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestContext.cs
+++ b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using System.IO;
+    using System.Linq;
     using System.Reflection;
     using Microsoft.Win32;
     using WixBuildTools.TestSupport;
@@ -11,15 +12,17 @@ namespace WixToolsetTest.BurnE2E
 
     public class WixTestContext
     {
-        static readonly string RootDataPath = Path.GetFullPath(TestData.Get(".."));
+        static readonly string RootDataPath = Path.GetFullPath(TestData.Get("TestData"));
 
-        public WixTestContext(ITestOutputHelper testOutputHelper, string testGroupName)
+        public WixTestContext(ITestOutputHelper testOutputHelper)
         {
             var test = GetTest(testOutputHelper);
+            var splitClassName = test.TestCase.TestMethod.TestClass.Class.Name.Split('.');
 
-            this.TestDataFolder = Path.Combine(RootDataPath, testGroupName);
-            this.TestGroupName = testGroupName;
+            this.TestGroupName = splitClassName.Last();
             this.TestName = test.TestCase.TestMethod.Method.Name;
+
+            this.TestDataFolder = Path.Combine(RootDataPath, this.TestGroupName);
         }
 
         public string TestDataFolder { get; }