Unit + functional test cleanup and reorganization.

src/VirtualClient/VirtualClient.Actions.FunctionalTests/CompressionProfileTests.cs

@@ -23,7 +23,7 @@ public class CompressionProfileTests
         public void SetupFixture()
         {
             this.mockFixture = new DependencyFixture();
-            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+            ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory);
         }
 
         [Test]
@@ -34,7 +34,7 @@ public void SetupFixture()
         public void CompressionWorkloadProfileParametersAreInlinedCorrectly(string profile, PlatformID platformID, Architecture architecture)
         {
             this.mockFixture.Setup(platformID, architecture);
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 WorkloadAssert.ParameterReferencesInlined(executor.Profile);
             }
@@ -63,21 +63,21 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl
 
                 if (arguments.Contains("7z", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Compressor7zipResults.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Compressor7zipResults.txt"));
                 }
                 else if (arguments.Contains("gzip", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardError.Append(TestDependencies.GetResourceFileContents("GzipResults.txt"));
+                    process.StandardError.Append(MockFixture.ReadTestResourcesFile("GzipResults.txt"));
                 }
                 else if (arguments.Contains("pbzip2", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardError.Append(TestDependencies.GetResourceFileContents("Pbzip2Results.txt"));
+                    process.StandardError.Append(MockFixture.ReadTestResourcesFile("Pbzip2Results.txt"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 executor.ExecuteDependencies = false;
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
@@ -92,7 +92,7 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl
         public void CompressionWorkloadProfileParametersAreInlinedCorrectly_LZbench(string profile, PlatformID platformID, Architecture architecture)
         {
             this.mockFixture.Setup(platformID, architecture);
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 WorkloadAssert.ParameterReferencesInlined(executor.Profile);
             }
@@ -117,13 +117,13 @@ public async Task CompressionWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl
 
                 if (arguments.Contains("lzbenchexecutor.sh", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("LzbenchResults.csv"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("LzbenchResults.csv"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 executor.ExecuteDependencies = false;
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);

src/VirtualClient/VirtualClient.Actions.FunctionalTests/CoreMarkProfileTests.cs

@@ -12,6 +12,7 @@ namespace VirtualClient.Actions
     using NUnit.Framework;
     using VirtualClient.Common;
     using VirtualClient.Contracts;
+    using VirtualClient.TestExtensions;
 
     [TestFixture]
     [Category("Functional")]
@@ -23,15 +24,15 @@ public class CoreMarkProfileTests
         public void SetupFixture()
         {
             this.mockFixture = new DependencyFixture();
-            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+            ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory);
         }
 
         [Test]
         [TestCase("PERF-CPU-COREMARK.json")]
         public void CoreMarkWorkloadProfileParametersAreInlinedCorrectly(string profile)
         {
             this.mockFixture.Setup(PlatformID.Unix);
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 WorkloadAssert.ParameterReferencesInlined(executor.Profile);
             }
@@ -42,7 +43,7 @@ public void CoreMarkWorkloadProfileParametersAreInlinedCorrectly(string profile)
         public void CoreMarkProWorkloadProfileParametersAreInlinedCorrectly(string profile)
         {
             this.mockFixture.Setup(PlatformID.Unix);
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 WorkloadAssert.ParameterReferencesInlined(executor.Profile);
             }
@@ -73,13 +74,13 @@ public async Task CoreMarkWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPlatf
                 IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir);
                 if (arguments.Contains("XCFLAGS", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Coremark.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Coremark.txt"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
 
@@ -108,13 +109,13 @@ public async Task CoreMarkWorkloadProfileExecutesTheExpectedWorkloadsOnWindowsPl
                 IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir);
                 if (arguments.Contains("XCFLAGS", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_Coremark.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_Coremark.txt"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
 
@@ -147,13 +148,13 @@ public async Task CoreMarkProWorkloadProfileExecutesTheExpectedWorkloadsOnUnixPl
                 IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir);
                 if (arguments.Contains("certify-all", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_CoremarkPro.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_CoremarkPro.txt"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
 
@@ -187,13 +188,13 @@ public async Task CoreMarkProWorkloadProfileExecutesTheExpectedWorkloadsOnWindow
                 IProcessProxy process = this.mockFixture.CreateProcess(command, arguments, workingDir);
                 if (arguments.Contains("certify-all", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_CoremarkPro.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_CoremarkPro.txt"));
                 }
 
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
 

src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchClientProfileTests.cs

@@ -13,6 +13,7 @@ namespace VirtualClient.Actions
     using NUnit.Framework;
     using VirtualClient.Common;
     using VirtualClient.Contracts;
+    using VirtualClient.TestExtensions;
 
     [TestFixture]
     [Category("Functional")]
@@ -29,7 +30,7 @@ public void SetupFixture()
             this.clientAgentId = $"{Environment.MachineName}-Client";
             this.serverAgentId = $"{Environment.MachineName}-Server";
 
-            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+            ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory);
 
             this.mockFixture.Setup(PlatformID.Unix, Architecture.X64, this.clientAgentId).SetupLayout(
                 new ClientInstance(this.clientAgentId, "1.2.3.4", "Client"),
@@ -48,7 +49,7 @@ public async Task DeathStarBenchWorkloadProfileInstallsTheExpectedDependenciesOf
         {
             this.mockFixture.SystemManagement.SetupGet(sm => sm.AgentId).Returns(this.serverAgentId);
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 executor.ExecuteActions = false;
 
@@ -94,7 +95,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl
             };
 
             this.mockFixture.SetupPackage("deathstarbench", expectedFiles: expectedFiles);
-            this.mockFixture.SetupFile("deathstarbench/linux-x64/socialnetwork/wrk2", "results.txt", TestDependencies.GetResourceFileContents("Results_DeathStarBench.txt"));
+            this.mockFixture.SetupFile("deathstarbench/linux-x64/socialnetwork/wrk2", "results.txt", MockFixture.ReadTestResourcesFile("Results_DeathStarBench.txt"));
             this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose");
 
             this.mockFixture.ProcessManager.OnCreateProcess = (command, arguments, workingDir) =>
@@ -108,7 +109,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl
 
                 if (arguments.Contains("./wrk -D exp -t 20 -c 1000 -d 300s -L -s", StringComparison.OrdinalIgnoreCase))
                 {
-                    process.StandardOutput.Append(TestDependencies.GetResourceFileContents("Results_DeathStarBench.txt"));
+                    process.StandardOutput.Append(MockFixture.ReadTestResourcesFile("Results_DeathStarBench.txt"));
                 }
 
                 if (arguments == "bash -c \"docker ps | wc -l\"")
@@ -119,7 +120,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfCl
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None)
                     .ConfigureAwait(false);
@@ -133,7 +134,7 @@ await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None
         public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheClientWorkloadPackageDoesNotExist(string profile)
         {
             this.mockFixture.PackageManager.Clear();
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 executor.ExecuteDependencies = false;
                 DependencyException error = Assert.ThrowsAsync<DependencyException>(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None));

src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchProfileTests.cs

@@ -4,14 +4,12 @@
 namespace VirtualClient.Actions
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
     using System.Runtime.InteropServices;
-    using System.Text;
     using System.Threading;
-    using System.Threading.Tasks;
     using NUnit.Framework;
     using VirtualClient.Contracts;
+    using VirtualClient.TestExtensions;
 
     [TestFixture]
     [Category("Functional")]
@@ -30,14 +28,14 @@ public void SetupFixture()
 
             this.mockFixture.SetupDisks(withRemoteDisks: false);
 
-            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+            ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory);
         }
 
         [Test]
         [TestCase("PERF-NETWORK-DEATHSTARBENCH.json")]
         public void DeathStarBenchWorkloadProfileParametersAreInlinedCorrectly(string profile)
         {
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 WorkloadAssert.ParameterReferencesInlined(executor.Profile);
             }
@@ -50,7 +48,7 @@ public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheWorkloadPa
             // We ensure the workload package does not exist.
             this.mockFixture.PackageManager.Clear();
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 executor.ExecuteDependencies = false;
                 DependencyException error = Assert.ThrowsAsync<DependencyException>(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None));

src/VirtualClient/VirtualClient.Actions.FunctionalTests/DeathStarBench/DeathStarBenchServerProfileTests.cs

@@ -12,6 +12,7 @@ namespace VirtualClient.Actions
     using NUnit.Framework;
     using VirtualClient.Common;
     using VirtualClient.Contracts;
+    using VirtualClient.TestExtensions;
 
     [TestFixture]
     [Category("Functional")]
@@ -28,7 +29,7 @@ public void SetupFixture()
             this.clientAgentId = $"{Environment.MachineName}-Client";
             this.serverAgentId = $"{Environment.MachineName}-Server";
 
-            ComponentTypeCache.Instance.LoadComponentTypes(TestDependencies.TestDirectory);
+            ComponentTypeCache.Instance.LoadComponentTypes(MockFixture.TestAssemblyDirectory);
 
             DeathStarBenchExecutor.StateConfirmationPollingTimeout = TimeSpan.FromMilliseconds(1);
             DeathStarBenchExecutor.ServerWarmUpTime = TimeSpan.FromMilliseconds(1);
@@ -46,7 +47,7 @@ public async Task DeathStarBenchWorkloadProfileInstallsTheExpectedDependenciesOf
             this.mockFixture.SetupPackage("libssl");
             this.mockFixture.SetupFile(@"/usr/local/bin/docker-compose");
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             { 
                 executor.ExecuteActions = false;
 
@@ -103,7 +104,7 @@ public async Task DeathStarBenchWorkloadProfileExecutesTheWorkloadAsExpectedOfSe
                 return process;
             };
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 await executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None).ConfigureAwait(false);
                 WorkloadAssert.CommandsExecuted(this.mockFixture, expectedCommands.ToArray());
@@ -122,7 +123,7 @@ public void DeathStarBenchWorkloadProfileActionsWillNotBeExecutedIfTheClientWork
 
             this.mockFixture.SetupPackage("libssl");
 
-            using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
+            using (ProfileExecutor executor = TestProfileResources.CreateProfileExecutor(profile, this.mockFixture.Dependencies))
             {
                 DependencyException error = Assert.ThrowsAsync<DependencyException>(() => executor.ExecuteAsync(ProfileTiming.OneIteration(), CancellationToken.None));
                 Assert.AreEqual(ErrorReason.WorkloadDependencyMissing, error.Reason);