diff --git a/ArgsUniform/ArgsUniform.cs b/Framework/ArgsUniform/ArgsUniform.cs similarity index 100% rename from ArgsUniform/ArgsUniform.cs rename to Framework/ArgsUniform/ArgsUniform.cs diff --git a/ArgsUniform/ArgsUniform.csproj b/Framework/ArgsUniform/ArgsUniform.csproj similarity index 100% rename from ArgsUniform/ArgsUniform.csproj rename to Framework/ArgsUniform/ArgsUniform.csproj diff --git a/ArgsUniform/ExampleUser.cs b/Framework/ArgsUniform/ExampleUser.cs similarity index 100% rename from ArgsUniform/ExampleUser.cs rename to Framework/ArgsUniform/ExampleUser.cs diff --git a/ArgsUniform/UniformAttribute.cs b/Framework/ArgsUniform/UniformAttribute.cs similarity index 100% rename from ArgsUniform/UniformAttribute.cs rename to Framework/ArgsUniform/UniformAttribute.cs diff --git a/Core/Core.csproj b/Framework/Core/Core.csproj similarity index 100% rename from Core/Core.csproj rename to Framework/Core/Core.csproj diff --git a/Core/CoreInterface.cs b/Framework/Core/CoreInterface.cs similarity index 100% rename from Core/CoreInterface.cs rename to Framework/Core/CoreInterface.cs diff --git a/Core/DownloadedLog.cs b/Framework/Core/DownloadedLog.cs similarity index 100% rename from Core/DownloadedLog.cs rename to Framework/Core/DownloadedLog.cs diff --git a/Core/EntryPoint.cs b/Framework/Core/EntryPoint.cs similarity index 100% rename from Core/EntryPoint.cs rename to Framework/Core/EntryPoint.cs diff --git a/Core/Http.cs b/Framework/Core/Http.cs similarity index 100% rename from Core/Http.cs rename to Framework/Core/Http.cs diff --git a/Core/LogDownloadHandler.cs b/Framework/Core/LogDownloadHandler.cs similarity index 100% rename from Core/LogDownloadHandler.cs rename to Framework/Core/LogDownloadHandler.cs diff --git a/Core/PluginFinder.cs b/Framework/Core/PluginFinder.cs similarity index 100% rename from Core/PluginFinder.cs rename to Framework/Core/PluginFinder.cs diff --git a/Core/PluginManager.cs b/Framework/Core/PluginManager.cs similarity index 100% rename from Core/PluginManager.cs rename to Framework/Core/PluginManager.cs diff --git a/Core/PluginMetadata.cs b/Framework/Core/PluginMetadata.cs similarity index 100% rename from Core/PluginMetadata.cs rename to Framework/Core/PluginMetadata.cs diff --git a/Core/PluginTools.cs b/Framework/Core/PluginTools.cs similarity index 100% rename from Core/PluginTools.cs rename to Framework/Core/PluginTools.cs diff --git a/Core/SerializeGate.cs b/Framework/Core/SerializeGate.cs similarity index 100% rename from Core/SerializeGate.cs rename to Framework/Core/SerializeGate.cs diff --git a/Core/TimeSet.cs b/Framework/Core/TimeSet.cs similarity index 100% rename from Core/TimeSet.cs rename to Framework/Core/TimeSet.cs diff --git a/Core/ToolsFactory.cs b/Framework/Core/ToolsFactory.cs similarity index 100% rename from Core/ToolsFactory.cs rename to Framework/Core/ToolsFactory.cs diff --git a/FileUtils/FileManager.cs b/Framework/FileUtils/FileManager.cs similarity index 96% rename from FileUtils/FileManager.cs rename to Framework/FileUtils/FileManager.cs index 33641ab2..7723ae6c 100644 --- a/FileUtils/FileManager.cs +++ b/Framework/FileUtils/FileManager.cs @@ -1,5 +1,4 @@ using Logging; -using NUnit.Framework; using Utils; namespace FileUtils @@ -106,12 +105,12 @@ namespace FileUtils if (spaceAvailable < size.SizeInBytes) { - var msg = $"Inconclusive: Not enough disk space to perform test. " + + var msg = $"Not enough disk space. " + $"{Formatter.FormatByteSize(size.SizeInBytes)} required. " + $"{Formatter.FormatByteSize(spaceAvailable)} available."; log.Log(msg); - Assert.Inconclusive(msg); + throw new Exception(msg); } } diff --git a/FileUtils/FileUtils.csproj b/Framework/FileUtils/FileUtils.csproj similarity index 100% rename from FileUtils/FileUtils.csproj rename to Framework/FileUtils/FileUtils.csproj diff --git a/FileUtils/TrackedFile.cs b/Framework/FileUtils/TrackedFile.cs similarity index 82% rename from FileUtils/TrackedFile.cs rename to Framework/FileUtils/TrackedFile.cs index 3b6ccfb8..5f9b04a8 100644 --- a/FileUtils/TrackedFile.cs +++ b/Framework/FileUtils/TrackedFile.cs @@ -1,5 +1,4 @@ using Logging; -using NUnit.Framework; using Utils; namespace FileUtils @@ -40,10 +39,10 @@ namespace FileUtils private void AssertEqual(TrackedFile? actual) { - if (actual == null) Assert.Fail("TestFile is null."); - if (actual == this || actual!.Filename == Filename) Assert.Fail("TestFile is compared to itself."); + if (actual == null) FrameworkAssert.Fail("TestFile is null."); + if (actual == this || actual!.Filename == Filename) FrameworkAssert.Fail("TestFile is compared to itself."); - Assert.That(actual.GetFileSize(), Is.EqualTo(GetFileSize()), "Files are not of equal length."); + FrameworkAssert.That(actual.GetFileSize() == GetFileSize(), "Files are not of equal length."); using var streamExpected = new FileStream(Filename, FileMode.Open, FileAccess.Read); using var streamActual = new FileStream(actual.Filename, FileMode.Open, FileAccess.Read); @@ -65,11 +64,11 @@ namespace FileUtils return; } - Assert.That(readActual, Is.EqualTo(readExpected), "Unable to read buffers of equal length."); + FrameworkAssert.That(readActual == readExpected, "Unable to read buffers of equal length."); for (var i = 0; i < readActual; i++) { - if (bytesExpected[i] != bytesActual[i]) Assert.Fail("File contents not equal."); + if (bytesExpected[i] != bytesActual[i]) FrameworkAssert.Fail("File contents not equal."); } } } diff --git a/KubernetesWorkflow/ByteSizeExtensions.cs b/Framework/KubernetesWorkflow/ByteSizeExtensions.cs similarity index 100% rename from KubernetesWorkflow/ByteSizeExtensions.cs rename to Framework/KubernetesWorkflow/ByteSizeExtensions.cs diff --git a/KubernetesWorkflow/CommandRunner.cs b/Framework/KubernetesWorkflow/CommandRunner.cs similarity index 100% rename from KubernetesWorkflow/CommandRunner.cs rename to Framework/KubernetesWorkflow/CommandRunner.cs diff --git a/KubernetesWorkflow/Configuration.cs b/Framework/KubernetesWorkflow/Configuration.cs similarity index 100% rename from KubernetesWorkflow/Configuration.cs rename to Framework/KubernetesWorkflow/Configuration.cs diff --git a/KubernetesWorkflow/ContainerAdditionals.cs b/Framework/KubernetesWorkflow/ContainerAdditionals.cs similarity index 100% rename from KubernetesWorkflow/ContainerAdditionals.cs rename to Framework/KubernetesWorkflow/ContainerAdditionals.cs diff --git a/KubernetesWorkflow/ContainerRecipe.cs b/Framework/KubernetesWorkflow/ContainerRecipe.cs similarity index 100% rename from KubernetesWorkflow/ContainerRecipe.cs rename to Framework/KubernetesWorkflow/ContainerRecipe.cs diff --git a/KubernetesWorkflow/ContainerRecipeFactory.cs b/Framework/KubernetesWorkflow/ContainerRecipeFactory.cs similarity index 100% rename from KubernetesWorkflow/ContainerRecipeFactory.cs rename to Framework/KubernetesWorkflow/ContainerRecipeFactory.cs diff --git a/KubernetesWorkflow/ContainerResources.cs b/Framework/KubernetesWorkflow/ContainerResources.cs similarity index 100% rename from KubernetesWorkflow/ContainerResources.cs rename to Framework/KubernetesWorkflow/ContainerResources.cs diff --git a/KubernetesWorkflow/CrashWatcher.cs b/Framework/KubernetesWorkflow/CrashWatcher.cs similarity index 100% rename from KubernetesWorkflow/CrashWatcher.cs rename to Framework/KubernetesWorkflow/CrashWatcher.cs diff --git a/KubernetesWorkflow/K8sClient.cs b/Framework/KubernetesWorkflow/K8sClient.cs similarity index 100% rename from KubernetesWorkflow/K8sClient.cs rename to Framework/KubernetesWorkflow/K8sClient.cs diff --git a/KubernetesWorkflow/K8sCluster.cs b/Framework/KubernetesWorkflow/K8sCluster.cs similarity index 100% rename from KubernetesWorkflow/K8sCluster.cs rename to Framework/KubernetesWorkflow/K8sCluster.cs diff --git a/KubernetesWorkflow/K8sController.cs b/Framework/KubernetesWorkflow/K8sController.cs similarity index 100% rename from KubernetesWorkflow/K8sController.cs rename to Framework/KubernetesWorkflow/K8sController.cs diff --git a/KubernetesWorkflow/K8sHooks.cs b/Framework/KubernetesWorkflow/K8sHooks.cs similarity index 100% rename from KubernetesWorkflow/K8sHooks.cs rename to Framework/KubernetesWorkflow/K8sHooks.cs diff --git a/KubernetesWorkflow/K8sNameUtils.cs b/Framework/KubernetesWorkflow/K8sNameUtils.cs similarity index 100% rename from KubernetesWorkflow/K8sNameUtils.cs rename to Framework/KubernetesWorkflow/K8sNameUtils.cs diff --git a/KubernetesWorkflow/KnownK8sPods.cs b/Framework/KubernetesWorkflow/KnownK8sPods.cs similarity index 100% rename from KubernetesWorkflow/KnownK8sPods.cs rename to Framework/KubernetesWorkflow/KnownK8sPods.cs diff --git a/KubernetesWorkflow/KubernetesWorkflow.csproj b/Framework/KubernetesWorkflow/KubernetesWorkflow.csproj similarity index 88% rename from KubernetesWorkflow/KubernetesWorkflow.csproj rename to Framework/KubernetesWorkflow/KubernetesWorkflow.csproj index cf95d1dc..c9201c37 100644 --- a/KubernetesWorkflow/KubernetesWorkflow.csproj +++ b/Framework/KubernetesWorkflow/KubernetesWorkflow.csproj @@ -9,6 +9,7 @@ + diff --git a/KubernetesWorkflow/Location.cs b/Framework/KubernetesWorkflow/Location.cs similarity index 100% rename from KubernetesWorkflow/Location.cs rename to Framework/KubernetesWorkflow/Location.cs diff --git a/KubernetesWorkflow/PodAnnotations.cs b/Framework/KubernetesWorkflow/PodAnnotations.cs similarity index 100% rename from KubernetesWorkflow/PodAnnotations.cs rename to Framework/KubernetesWorkflow/PodAnnotations.cs diff --git a/KubernetesWorkflow/PodLabels.cs b/Framework/KubernetesWorkflow/PodLabels.cs similarity index 100% rename from KubernetesWorkflow/PodLabels.cs rename to Framework/KubernetesWorkflow/PodLabels.cs diff --git a/KubernetesWorkflow/RecipeComponentFactory.cs b/Framework/KubernetesWorkflow/RecipeComponentFactory.cs similarity index 100% rename from KubernetesWorkflow/RecipeComponentFactory.cs rename to Framework/KubernetesWorkflow/RecipeComponentFactory.cs diff --git a/KubernetesWorkflow/RunnerLocationUtils.cs b/Framework/KubernetesWorkflow/RunnerLocationUtils.cs similarity index 100% rename from KubernetesWorkflow/RunnerLocationUtils.cs rename to Framework/KubernetesWorkflow/RunnerLocationUtils.cs diff --git a/KubernetesWorkflow/RunningContainers.cs b/Framework/KubernetesWorkflow/RunningContainers.cs similarity index 100% rename from KubernetesWorkflow/RunningContainers.cs rename to Framework/KubernetesWorkflow/RunningContainers.cs diff --git a/KubernetesWorkflow/RunningPod.cs b/Framework/KubernetesWorkflow/RunningPod.cs similarity index 100% rename from KubernetesWorkflow/RunningPod.cs rename to Framework/KubernetesWorkflow/RunningPod.cs diff --git a/KubernetesWorkflow/StartupConfig.cs b/Framework/KubernetesWorkflow/StartupConfig.cs similarity index 100% rename from KubernetesWorkflow/StartupConfig.cs rename to Framework/KubernetesWorkflow/StartupConfig.cs diff --git a/KubernetesWorkflow/StartupWorkflow.cs b/Framework/KubernetesWorkflow/StartupWorkflow.cs similarity index 100% rename from KubernetesWorkflow/StartupWorkflow.cs rename to Framework/KubernetesWorkflow/StartupWorkflow.cs diff --git a/KubernetesWorkflow/WorkflowCreator.cs b/Framework/KubernetesWorkflow/WorkflowCreator.cs similarity index 100% rename from KubernetesWorkflow/WorkflowCreator.cs rename to Framework/KubernetesWorkflow/WorkflowCreator.cs diff --git a/KubernetesWorkflow/WorkflowNumberSource.cs b/Framework/KubernetesWorkflow/WorkflowNumberSource.cs similarity index 100% rename from KubernetesWorkflow/WorkflowNumberSource.cs rename to Framework/KubernetesWorkflow/WorkflowNumberSource.cs diff --git a/Logging/ApplicationIds.cs b/Framework/Logging/ApplicationIds.cs similarity index 100% rename from Logging/ApplicationIds.cs rename to Framework/Logging/ApplicationIds.cs diff --git a/Logging/BaseLog.cs b/Framework/Logging/BaseLog.cs similarity index 91% rename from Logging/BaseLog.cs rename to Framework/Logging/BaseLog.cs index e8a94a43..26d9c1e9 100644 --- a/Logging/BaseLog.cs +++ b/Framework/Logging/BaseLog.cs @@ -70,14 +70,6 @@ namespace Logging return new LogFile($"{GetFullName()}_{GetSubfileNumber()}", ext); } - public void WriteLogTag() - { - var runId = NameUtils.GetRunId(); - var category = NameUtils.GetCategoryName(); - var name = NameUtils.GetTestMethodName(); - LogFile.WriteRaw($"{runId} {category} {name}"); - } - private string ApplyReplacements(string str) { foreach (var replacement in replacements) diff --git a/Logging/LogConfig.cs b/Framework/Logging/LogConfig.cs similarity index 100% rename from Logging/LogConfig.cs rename to Framework/Logging/LogConfig.cs diff --git a/Logging/LogFile.cs b/Framework/Logging/LogFile.cs similarity index 100% rename from Logging/LogFile.cs rename to Framework/Logging/LogFile.cs diff --git a/Logging/LogPrefixer.cs b/Framework/Logging/LogPrefixer.cs similarity index 100% rename from Logging/LogPrefixer.cs rename to Framework/Logging/LogPrefixer.cs diff --git a/Logging/Logging.csproj b/Framework/Logging/Logging.csproj similarity index 59% rename from Logging/Logging.csproj rename to Framework/Logging/Logging.csproj index defbdccf..0757f272 100644 --- a/Logging/Logging.csproj +++ b/Framework/Logging/Logging.csproj @@ -7,12 +7,6 @@ enable - - - - - - diff --git a/Logging/NullLog.cs b/Framework/Logging/NullLog.cs similarity index 88% rename from Logging/NullLog.cs rename to Framework/Logging/NullLog.cs index c969b17c..997e490b 100644 --- a/Logging/NullLog.cs +++ b/Framework/Logging/NullLog.cs @@ -1,8 +1,8 @@ namespace Logging { - public class NullLog : TestLog + public class NullLog : BaseLog { - public NullLog() : base("NULL", false, "NULL") + public NullLog() : base(false) { } diff --git a/Logging/Stopwatch.cs b/Framework/Logging/Stopwatch.cs similarity index 100% rename from Logging/Stopwatch.cs rename to Framework/Logging/Stopwatch.cs diff --git a/Nethereum/ConversionExtensions.cs b/Framework/NethereumWorkflow/ConversionExtensions.cs similarity index 100% rename from Nethereum/ConversionExtensions.cs rename to Framework/NethereumWorkflow/ConversionExtensions.cs diff --git a/Nethereum/NethereumInteraction.cs b/Framework/NethereumWorkflow/NethereumInteraction.cs similarity index 100% rename from Nethereum/NethereumInteraction.cs rename to Framework/NethereumWorkflow/NethereumInteraction.cs diff --git a/Nethereum/NethereumInteractionCreator.cs b/Framework/NethereumWorkflow/NethereumInteractionCreator.cs similarity index 100% rename from Nethereum/NethereumInteractionCreator.cs rename to Framework/NethereumWorkflow/NethereumInteractionCreator.cs diff --git a/Nethereum/NethereumWorkflow.csproj b/Framework/NethereumWorkflow/NethereumWorkflow.csproj similarity index 100% rename from Nethereum/NethereumWorkflow.csproj rename to Framework/NethereumWorkflow/NethereumWorkflow.csproj diff --git a/Utils/Address.cs b/Framework/Utils/Address.cs similarity index 100% rename from Utils/Address.cs rename to Framework/Utils/Address.cs diff --git a/Utils/ByteSize.cs b/Framework/Utils/ByteSize.cs similarity index 100% rename from Utils/ByteSize.cs rename to Framework/Utils/ByteSize.cs diff --git a/Utils/DebugStack.cs b/Framework/Utils/DebugStack.cs similarity index 100% rename from Utils/DebugStack.cs rename to Framework/Utils/DebugStack.cs diff --git a/Utils/Formatter.cs b/Framework/Utils/Formatter.cs similarity index 100% rename from Utils/Formatter.cs rename to Framework/Utils/Formatter.cs diff --git a/Framework/Utils/FrameworkAssert.cs b/Framework/Utils/FrameworkAssert.cs new file mode 100644 index 00000000..325f7cf2 --- /dev/null +++ b/Framework/Utils/FrameworkAssert.cs @@ -0,0 +1,15 @@ +namespace Utils +{ + public static class FrameworkAssert + { + public static void That(bool condition, string message) + { + if (!condition) Fail(message); + } + + public static void Fail(string message) + { + throw new Exception(message); + } + } +} diff --git a/Utils/NumberSource.cs b/Framework/Utils/NumberSource.cs similarity index 100% rename from Utils/NumberSource.cs rename to Framework/Utils/NumberSource.cs diff --git a/Utils/ParseEnum.cs b/Framework/Utils/ParseEnum.cs similarity index 100% rename from Utils/ParseEnum.cs rename to Framework/Utils/ParseEnum.cs diff --git a/Utils/RandomUtils.cs b/Framework/Utils/RandomUtils.cs similarity index 100% rename from Utils/RandomUtils.cs rename to Framework/Utils/RandomUtils.cs diff --git a/Utils/Time.cs b/Framework/Utils/Time.cs similarity index 100% rename from Utils/Time.cs rename to Framework/Utils/Time.cs diff --git a/Utils/Utils.csproj b/Framework/Utils/Utils.csproj similarity index 100% rename from Utils/Utils.csproj rename to Framework/Utils/Utils.csproj diff --git a/CodexContractsPlugin/CodexContractsAccess.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsAccess.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsAccess.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsAccess.cs diff --git a/CodexContractsPlugin/CodexContractsContainerConfig.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerConfig.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsContainerConfig.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsContainerConfig.cs diff --git a/CodexContractsPlugin/CodexContractsContainerRecipe.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsContainerRecipe.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsContainerRecipe.cs diff --git a/CodexContractsPlugin/CodexContractsDeployment.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsDeployment.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsDeployment.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsDeployment.cs diff --git a/CodexContractsPlugin/CodexContractsPlugin.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsPlugin.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.cs diff --git a/CodexContractsPlugin/CodexContractsPlugin.csproj b/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj similarity index 100% rename from CodexContractsPlugin/CodexContractsPlugin.csproj rename to ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj diff --git a/CodexContractsPlugin/CodexContractsStarter.cs b/ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs similarity index 100% rename from CodexContractsPlugin/CodexContractsStarter.cs rename to ProjectPlugins/CodexContractsPlugin/CodexContractsStarter.cs diff --git a/CodexContractsPlugin/ContractInteractions.cs b/ProjectPlugins/CodexContractsPlugin/ContractInteractions.cs similarity index 100% rename from CodexContractsPlugin/ContractInteractions.cs rename to ProjectPlugins/CodexContractsPlugin/ContractInteractions.cs diff --git a/CodexContractsPlugin/ContractsContainerInfoExtractor.cs b/ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs similarity index 100% rename from CodexContractsPlugin/ContractsContainerInfoExtractor.cs rename to ProjectPlugins/CodexContractsPlugin/ContractsContainerInfoExtractor.cs diff --git a/CodexContractsPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/CodexContractsPlugin/CoreInterfaceExtensions.cs similarity index 100% rename from CodexContractsPlugin/CoreInterfaceExtensions.cs rename to ProjectPlugins/CodexContractsPlugin/CoreInterfaceExtensions.cs diff --git a/CodexContractsPlugin/TestTokenExtensions.cs b/ProjectPlugins/CodexContractsPlugin/TestTokenExtensions.cs similarity index 100% rename from CodexContractsPlugin/TestTokenExtensions.cs rename to ProjectPlugins/CodexContractsPlugin/TestTokenExtensions.cs diff --git a/CodexPlugin/CodexAccess.cs b/ProjectPlugins/CodexPlugin/CodexAccess.cs similarity index 100% rename from CodexPlugin/CodexAccess.cs rename to ProjectPlugins/CodexPlugin/CodexAccess.cs diff --git a/CodexPlugin/CodexApiTypes.cs b/ProjectPlugins/CodexPlugin/CodexApiTypes.cs similarity index 100% rename from CodexPlugin/CodexApiTypes.cs rename to ProjectPlugins/CodexPlugin/CodexApiTypes.cs diff --git a/CodexPlugin/CodexContainerRecipe.cs b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs similarity index 100% rename from CodexPlugin/CodexContainerRecipe.cs rename to ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs diff --git a/CodexPlugin/CodexDeployment.cs b/ProjectPlugins/CodexPlugin/CodexDeployment.cs similarity index 100% rename from CodexPlugin/CodexDeployment.cs rename to ProjectPlugins/CodexPlugin/CodexDeployment.cs diff --git a/CodexPlugin/CodexLogLevel.cs b/ProjectPlugins/CodexPlugin/CodexLogLevel.cs similarity index 100% rename from CodexPlugin/CodexLogLevel.cs rename to ProjectPlugins/CodexPlugin/CodexLogLevel.cs diff --git a/CodexPlugin/CodexNode.cs b/ProjectPlugins/CodexPlugin/CodexNode.cs similarity index 95% rename from CodexPlugin/CodexNode.cs rename to ProjectPlugins/CodexPlugin/CodexNode.cs index c7560ff2..a47f2b21 100644 --- a/CodexPlugin/CodexNode.cs +++ b/ProjectPlugins/CodexPlugin/CodexNode.cs @@ -4,7 +4,6 @@ using GethPlugin; using KubernetesWorkflow; using Logging; using MetricsPlugin; -using NUnit.Framework; using Utils; namespace CodexPlugin @@ -91,8 +90,8 @@ namespace CodexPlugin return CodexAccess.UploadFile(fileStream); }); - if (string.IsNullOrEmpty(response)) Assert.Fail("Received empty response."); - if (response.StartsWith(UploadFailedMessage)) Assert.Fail("Node failed to store block."); + if (string.IsNullOrEmpty(response)) FrameworkAssert.Fail("Received empty response."); + if (response.StartsWith(UploadFailedMessage)) FrameworkAssert.Fail("Node failed to store block."); Log($"Uploaded file. Received contentId: '{response}'."); return new ContentId(response); @@ -116,7 +115,7 @@ namespace CodexPlugin var peerInfo = node.GetDebugInfo(); var response = CodexAccess.ConnectToPeer(peerInfo.id, GetPeerMultiAddress(peer, peerInfo)); - Assert.That(response, Is.EqualTo(SuccessfullyConnectedMessage), "Unable to connect codex nodes."); + FrameworkAssert.That(response == SuccessfullyConnectedMessage, "Unable to connect codex nodes."); Log($"Successfully connected to peer {peer.GetName()}."); } diff --git a/CodexPlugin/CodexNodeFactory.cs b/ProjectPlugins/CodexPlugin/CodexNodeFactory.cs similarity index 100% rename from CodexPlugin/CodexNodeFactory.cs rename to ProjectPlugins/CodexPlugin/CodexNodeFactory.cs diff --git a/CodexPlugin/CodexNodeGroup.cs b/ProjectPlugins/CodexPlugin/CodexNodeGroup.cs similarity index 100% rename from CodexPlugin/CodexNodeGroup.cs rename to ProjectPlugins/CodexPlugin/CodexNodeGroup.cs diff --git a/CodexPlugin/CodexPlugin.cs b/ProjectPlugins/CodexPlugin/CodexPlugin.cs similarity index 100% rename from CodexPlugin/CodexPlugin.cs rename to ProjectPlugins/CodexPlugin/CodexPlugin.cs diff --git a/CodexPlugin/CodexPlugin.csproj b/ProjectPlugins/CodexPlugin/CodexPlugin.csproj similarity index 100% rename from CodexPlugin/CodexPlugin.csproj rename to ProjectPlugins/CodexPlugin/CodexPlugin.csproj diff --git a/CodexPlugin/CodexSetup.cs b/ProjectPlugins/CodexPlugin/CodexSetup.cs similarity index 100% rename from CodexPlugin/CodexSetup.cs rename to ProjectPlugins/CodexPlugin/CodexSetup.cs diff --git a/CodexPlugin/CodexStarter.cs b/ProjectPlugins/CodexPlugin/CodexStarter.cs similarity index 100% rename from CodexPlugin/CodexStarter.cs rename to ProjectPlugins/CodexPlugin/CodexStarter.cs diff --git a/CodexPlugin/CodexStartupConfig.cs b/ProjectPlugins/CodexPlugin/CodexStartupConfig.cs similarity index 100% rename from CodexPlugin/CodexStartupConfig.cs rename to ProjectPlugins/CodexPlugin/CodexStartupConfig.cs diff --git a/CodexPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs similarity index 100% rename from CodexPlugin/CoreInterfaceExtensions.cs rename to ProjectPlugins/CodexPlugin/CoreInterfaceExtensions.cs diff --git a/CodexPlugin/MarketplaceAccess.cs b/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs similarity index 95% rename from CodexPlugin/MarketplaceAccess.cs rename to ProjectPlugins/CodexPlugin/MarketplaceAccess.cs index 2a0683a3..5734c4f0 100644 --- a/CodexPlugin/MarketplaceAccess.cs +++ b/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs @@ -1,7 +1,6 @@ using CodexContractsPlugin; using Logging; using Newtonsoft.Json; -using NUnit.Framework; using Utils; using System.Numerics; @@ -113,7 +112,7 @@ namespace CodexPlugin private void Unavailable() { - Assert.Fail("Incorrect test setup: Marketplace was not enabled for this group of Codex nodes. Add 'EnableMarketplace(...)' after 'SetupCodexNodes()' to enable it."); + FrameworkAssert.Fail("Incorrect test setup: Marketplace was not enabled for this group of Codex nodes. Add 'EnableMarketplace(...)' after 'SetupCodexNodes()' to enable it."); throw new InvalidOperationException(); } } @@ -189,12 +188,12 @@ namespace CodexPlugin if (lastState == "errored") { - Assert.Fail("Contract errored: " + statusJson); + FrameworkAssert.Fail("Contract errored: " + statusJson); } if (DateTime.UtcNow - waitStart > timeout) { - Assert.Fail($"Contract did not reach '{desiredState}' within timeout. {statusJson}"); + FrameworkAssert.Fail($"Contract did not reach '{desiredState}' within timeout. {statusJson}"); } } log.Log($"Contract '{desiredState}'."); diff --git a/CodexPlugin/MarketplaceInitialConfig.cs b/ProjectPlugins/CodexPlugin/MarketplaceInitialConfig.cs similarity index 100% rename from CodexPlugin/MarketplaceInitialConfig.cs rename to ProjectPlugins/CodexPlugin/MarketplaceInitialConfig.cs diff --git a/CodexPlugin/MarketplaceStartResults.cs b/ProjectPlugins/CodexPlugin/MarketplaceStartResults.cs similarity index 100% rename from CodexPlugin/MarketplaceStartResults.cs rename to ProjectPlugins/CodexPlugin/MarketplaceStartResults.cs diff --git a/CodexPlugin/MarketplaceStarter.cs b/ProjectPlugins/CodexPlugin/MarketplaceStarter.cs similarity index 100% rename from CodexPlugin/MarketplaceStarter.cs rename to ProjectPlugins/CodexPlugin/MarketplaceStarter.cs diff --git a/GethPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/GethPlugin/CoreInterfaceExtensions.cs similarity index 100% rename from GethPlugin/CoreInterfaceExtensions.cs rename to ProjectPlugins/GethPlugin/CoreInterfaceExtensions.cs diff --git a/GethPlugin/EthAddress.cs b/ProjectPlugins/GethPlugin/EthAddress.cs similarity index 100% rename from GethPlugin/EthAddress.cs rename to ProjectPlugins/GethPlugin/EthAddress.cs diff --git a/GethPlugin/EthTokenExtensions.cs b/ProjectPlugins/GethPlugin/EthTokenExtensions.cs similarity index 100% rename from GethPlugin/EthTokenExtensions.cs rename to ProjectPlugins/GethPlugin/EthTokenExtensions.cs diff --git a/GethPlugin/GethAccount.cs b/ProjectPlugins/GethPlugin/GethAccount.cs similarity index 100% rename from GethPlugin/GethAccount.cs rename to ProjectPlugins/GethPlugin/GethAccount.cs diff --git a/GethPlugin/GethContainerInfoExtractor.cs b/ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs similarity index 100% rename from GethPlugin/GethContainerInfoExtractor.cs rename to ProjectPlugins/GethPlugin/GethContainerInfoExtractor.cs diff --git a/GethPlugin/GethContainerRecipe.cs b/ProjectPlugins/GethPlugin/GethContainerRecipe.cs similarity index 100% rename from GethPlugin/GethContainerRecipe.cs rename to ProjectPlugins/GethPlugin/GethContainerRecipe.cs diff --git a/GethPlugin/GethDeployment.cs b/ProjectPlugins/GethPlugin/GethDeployment.cs similarity index 100% rename from GethPlugin/GethDeployment.cs rename to ProjectPlugins/GethPlugin/GethDeployment.cs diff --git a/GethPlugin/GethNode.cs b/ProjectPlugins/GethPlugin/GethNode.cs similarity index 100% rename from GethPlugin/GethNode.cs rename to ProjectPlugins/GethPlugin/GethNode.cs diff --git a/GethPlugin/GethPlugin.cs b/ProjectPlugins/GethPlugin/GethPlugin.cs similarity index 100% rename from GethPlugin/GethPlugin.cs rename to ProjectPlugins/GethPlugin/GethPlugin.cs diff --git a/GethPlugin/GethPlugin.csproj b/ProjectPlugins/GethPlugin/GethPlugin.csproj similarity index 100% rename from GethPlugin/GethPlugin.csproj rename to ProjectPlugins/GethPlugin/GethPlugin.csproj diff --git a/GethPlugin/GethStarter.cs b/ProjectPlugins/GethPlugin/GethStarter.cs similarity index 100% rename from GethPlugin/GethStarter.cs rename to ProjectPlugins/GethPlugin/GethStarter.cs diff --git a/GethPlugin/GethStartupConfig.cs b/ProjectPlugins/GethPlugin/GethStartupConfig.cs similarity index 100% rename from GethPlugin/GethStartupConfig.cs rename to ProjectPlugins/GethPlugin/GethStartupConfig.cs diff --git a/MetricsPlugin/CoreInterfaceExtensions.cs b/ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs similarity index 100% rename from MetricsPlugin/CoreInterfaceExtensions.cs rename to ProjectPlugins/MetricsPlugin/CoreInterfaceExtensions.cs diff --git a/MetricsPlugin/MetricsAccess.cs b/ProjectPlugins/MetricsPlugin/MetricsAccess.cs similarity index 100% rename from MetricsPlugin/MetricsAccess.cs rename to ProjectPlugins/MetricsPlugin/MetricsAccess.cs diff --git a/MetricsPlugin/MetricsDownloader.cs b/ProjectPlugins/MetricsPlugin/MetricsDownloader.cs similarity index 100% rename from MetricsPlugin/MetricsDownloader.cs rename to ProjectPlugins/MetricsPlugin/MetricsDownloader.cs diff --git a/MetricsPlugin/MetricsPlugin.cs b/ProjectPlugins/MetricsPlugin/MetricsPlugin.cs similarity index 100% rename from MetricsPlugin/MetricsPlugin.cs rename to ProjectPlugins/MetricsPlugin/MetricsPlugin.cs diff --git a/MetricsPlugin/MetricsPlugin.csproj b/ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj similarity index 100% rename from MetricsPlugin/MetricsPlugin.csproj rename to ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj diff --git a/MetricsPlugin/MetricsQuery.cs b/ProjectPlugins/MetricsPlugin/MetricsQuery.cs similarity index 100% rename from MetricsPlugin/MetricsQuery.cs rename to ProjectPlugins/MetricsPlugin/MetricsQuery.cs diff --git a/MetricsPlugin/MetricsScrapeTarget.cs b/ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs similarity index 100% rename from MetricsPlugin/MetricsScrapeTarget.cs rename to ProjectPlugins/MetricsPlugin/MetricsScrapeTarget.cs diff --git a/MetricsPlugin/PrometheusContainerRecipe.cs b/ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs similarity index 100% rename from MetricsPlugin/PrometheusContainerRecipe.cs rename to ProjectPlugins/MetricsPlugin/PrometheusContainerRecipe.cs diff --git a/MetricsPlugin/PrometheusStarter.cs b/ProjectPlugins/MetricsPlugin/PrometheusStarter.cs similarity index 100% rename from MetricsPlugin/PrometheusStarter.cs rename to ProjectPlugins/MetricsPlugin/PrometheusStarter.cs diff --git a/MetricsPlugin/PrometheusStartupConfig.cs b/ProjectPlugins/MetricsPlugin/PrometheusStartupConfig.cs similarity index 100% rename from MetricsPlugin/PrometheusStartupConfig.cs rename to ProjectPlugins/MetricsPlugin/PrometheusStartupConfig.cs diff --git a/MetricsPlugin/dashboard.json b/ProjectPlugins/MetricsPlugin/dashboard.json similarity index 100% rename from MetricsPlugin/dashboard.json rename to ProjectPlugins/MetricsPlugin/dashboard.json diff --git a/ContinuousTests/CodexAccessFactory.cs b/Tests/CodexContinuousTests/CodexAccessFactory.cs similarity index 100% rename from ContinuousTests/CodexAccessFactory.cs rename to Tests/CodexContinuousTests/CodexAccessFactory.cs diff --git a/ContinuousTests/ContinuousTests.csproj b/Tests/CodexContinuousTests/CodexContinuousTests.csproj similarity index 100% rename from ContinuousTests/ContinuousTests.csproj rename to Tests/CodexContinuousTests/CodexContinuousTests.csproj diff --git a/ContinuousTests/Configuration.cs b/Tests/CodexContinuousTests/Configuration.cs similarity index 100% rename from ContinuousTests/Configuration.cs rename to Tests/CodexContinuousTests/Configuration.cs diff --git a/ContinuousTests/ContinuousTest.cs b/Tests/CodexContinuousTests/ContinuousTest.cs similarity index 100% rename from ContinuousTests/ContinuousTest.cs rename to Tests/CodexContinuousTests/ContinuousTest.cs diff --git a/ContinuousTests/ContinuousTestRunner.cs b/Tests/CodexContinuousTests/ContinuousTestRunner.cs similarity index 100% rename from ContinuousTests/ContinuousTestRunner.cs rename to Tests/CodexContinuousTests/ContinuousTestRunner.cs diff --git a/ContinuousTests/K8sFactory.cs b/Tests/CodexContinuousTests/K8sFactory.cs similarity index 100% rename from ContinuousTests/K8sFactory.cs rename to Tests/CodexContinuousTests/K8sFactory.cs diff --git a/ContinuousTests/NodeRunner.cs b/Tests/CodexContinuousTests/NodeRunner.cs similarity index 100% rename from ContinuousTests/NodeRunner.cs rename to Tests/CodexContinuousTests/NodeRunner.cs diff --git a/ContinuousTests/Program.cs b/Tests/CodexContinuousTests/Program.cs similarity index 100% rename from ContinuousTests/Program.cs rename to Tests/CodexContinuousTests/Program.cs diff --git a/ContinuousTests/SingleTestRun.cs b/Tests/CodexContinuousTests/SingleTestRun.cs similarity index 100% rename from ContinuousTests/SingleTestRun.cs rename to Tests/CodexContinuousTests/SingleTestRun.cs diff --git a/ContinuousTests/StartupChecker.cs b/Tests/CodexContinuousTests/StartupChecker.cs similarity index 100% rename from ContinuousTests/StartupChecker.cs rename to Tests/CodexContinuousTests/StartupChecker.cs diff --git a/ContinuousTests/TaskFactory.cs b/Tests/CodexContinuousTests/TaskFactory.cs similarity index 100% rename from ContinuousTests/TaskFactory.cs rename to Tests/CodexContinuousTests/TaskFactory.cs diff --git a/ContinuousTests/TestFactory.cs b/Tests/CodexContinuousTests/TestFactory.cs similarity index 100% rename from ContinuousTests/TestFactory.cs rename to Tests/CodexContinuousTests/TestFactory.cs diff --git a/ContinuousTests/TestHandle.cs b/Tests/CodexContinuousTests/TestHandle.cs similarity index 100% rename from ContinuousTests/TestHandle.cs rename to Tests/CodexContinuousTests/TestHandle.cs diff --git a/ContinuousTests/TestLoop.cs b/Tests/CodexContinuousTests/TestLoop.cs similarity index 100% rename from ContinuousTests/TestLoop.cs rename to Tests/CodexContinuousTests/TestLoop.cs diff --git a/ContinuousTests/TestMomentAttribute.cs b/Tests/CodexContinuousTests/TestMomentAttribute.cs similarity index 100% rename from ContinuousTests/TestMomentAttribute.cs rename to Tests/CodexContinuousTests/TestMomentAttribute.cs diff --git a/ContinuousTests/Tests/HoldMyBeerTest.cs b/Tests/CodexContinuousTests/Tests/HoldMyBeerTest.cs similarity index 100% rename from ContinuousTests/Tests/HoldMyBeerTest.cs rename to Tests/CodexContinuousTests/Tests/HoldMyBeerTest.cs diff --git a/ContinuousTests/Tests/MarketplaceTest.cs b/Tests/CodexContinuousTests/Tests/MarketplaceTest.cs similarity index 100% rename from ContinuousTests/Tests/MarketplaceTest.cs rename to Tests/CodexContinuousTests/Tests/MarketplaceTest.cs diff --git a/ContinuousTests/Tests/PeersTest.cs b/Tests/CodexContinuousTests/Tests/PeersTest.cs similarity index 100% rename from ContinuousTests/Tests/PeersTest.cs rename to Tests/CodexContinuousTests/Tests/PeersTest.cs diff --git a/ContinuousTests/Tests/PerformanceTests.cs b/Tests/CodexContinuousTests/Tests/PerformanceTests.cs similarity index 100% rename from ContinuousTests/Tests/PerformanceTests.cs rename to Tests/CodexContinuousTests/Tests/PerformanceTests.cs diff --git a/ContinuousTests/Tests/ThresholdChecks.cs b/Tests/CodexContinuousTests/Tests/ThresholdChecks.cs similarity index 100% rename from ContinuousTests/Tests/ThresholdChecks.cs rename to Tests/CodexContinuousTests/Tests/ThresholdChecks.cs diff --git a/ContinuousTests/Tests/TransientNodeTest.cs b/Tests/CodexContinuousTests/Tests/TransientNodeTest.cs similarity index 100% rename from ContinuousTests/Tests/TransientNodeTest.cs rename to Tests/CodexContinuousTests/Tests/TransientNodeTest.cs diff --git a/ContinuousTests/Tests/TwoClientTest.cs b/Tests/CodexContinuousTests/Tests/TwoClientTest.cs similarity index 100% rename from ContinuousTests/Tests/TwoClientTest.cs rename to Tests/CodexContinuousTests/Tests/TwoClientTest.cs diff --git a/ContinuousTests/reports/CodexTestNetReport-August2023.md b/Tests/CodexContinuousTests/reports/CodexTestNetReport-August2023.md similarity index 100% rename from ContinuousTests/reports/CodexTestNetReport-August2023.md rename to Tests/CodexContinuousTests/reports/CodexTestNetReport-August2023.md diff --git a/ContinuousTests/reports/CodexTestNetReport-July2023.md b/Tests/CodexContinuousTests/reports/CodexTestNetReport-July2023.md similarity index 100% rename from ContinuousTests/reports/CodexTestNetReport-July2023.md rename to Tests/CodexContinuousTests/reports/CodexTestNetReport-July2023.md diff --git a/ContinuousTests/run.sh b/Tests/CodexContinuousTests/run.sh similarity index 100% rename from ContinuousTests/run.sh rename to Tests/CodexContinuousTests/run.sh diff --git a/LongTests/BasicTests/DownloadTests.cs b/Tests/CodexLongTests/BasicTests/DownloadTests.cs similarity index 100% rename from LongTests/BasicTests/DownloadTests.cs rename to Tests/CodexLongTests/BasicTests/DownloadTests.cs diff --git a/LongTests/BasicTests/LargeFileTests.cs b/Tests/CodexLongTests/BasicTests/LargeFileTests.cs similarity index 100% rename from LongTests/BasicTests/LargeFileTests.cs rename to Tests/CodexLongTests/BasicTests/LargeFileTests.cs diff --git a/LongTests/BasicTests/TestInfraTests.cs b/Tests/CodexLongTests/BasicTests/TestInfraTests.cs similarity index 100% rename from LongTests/BasicTests/TestInfraTests.cs rename to Tests/CodexLongTests/BasicTests/TestInfraTests.cs diff --git a/LongTests/BasicTests/UploadTests.cs b/Tests/CodexLongTests/BasicTests/UploadTests.cs similarity index 100% rename from LongTests/BasicTests/UploadTests.cs rename to Tests/CodexLongTests/BasicTests/UploadTests.cs diff --git a/LongTests/TestsLong.csproj b/Tests/CodexLongTests/CodexTestsLong.csproj similarity index 100% rename from LongTests/TestsLong.csproj rename to Tests/CodexLongTests/CodexTestsLong.csproj diff --git a/LongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs b/Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs similarity index 100% rename from LongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs rename to Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs diff --git a/LongTests/Parallelism.cs b/Tests/CodexLongTests/Parallelism.cs similarity index 100% rename from LongTests/Parallelism.cs rename to Tests/CodexLongTests/Parallelism.cs diff --git a/Tests/AutoBootstrapDistTest.cs b/Tests/CodexTests/AutoBootstrapDistTest.cs similarity index 100% rename from Tests/AutoBootstrapDistTest.cs rename to Tests/CodexTests/AutoBootstrapDistTest.cs diff --git a/Tests/BasicTests/ContinuousSubstitute.cs b/Tests/CodexTests/BasicTests/ContinuousSubstitute.cs similarity index 100% rename from Tests/BasicTests/ContinuousSubstitute.cs rename to Tests/CodexTests/BasicTests/ContinuousSubstitute.cs diff --git a/Tests/BasicTests/ExampleTests.cs b/Tests/CodexTests/BasicTests/ExampleTests.cs similarity index 100% rename from Tests/BasicTests/ExampleTests.cs rename to Tests/CodexTests/BasicTests/ExampleTests.cs diff --git a/Tests/BasicTests/NetworkIsolationTest.cs b/Tests/CodexTests/BasicTests/NetworkIsolationTest.cs similarity index 100% rename from Tests/BasicTests/NetworkIsolationTest.cs rename to Tests/CodexTests/BasicTests/NetworkIsolationTest.cs diff --git a/Tests/BasicTests/OneClientTests.cs b/Tests/CodexTests/BasicTests/OneClientTests.cs similarity index 100% rename from Tests/BasicTests/OneClientTests.cs rename to Tests/CodexTests/BasicTests/OneClientTests.cs diff --git a/Tests/BasicTests/ThreeClientTest.cs b/Tests/CodexTests/BasicTests/ThreeClientTest.cs similarity index 100% rename from Tests/BasicTests/ThreeClientTest.cs rename to Tests/CodexTests/BasicTests/ThreeClientTest.cs diff --git a/Tests/BasicTests/TwoClientTests.cs b/Tests/CodexTests/BasicTests/TwoClientTests.cs similarity index 100% rename from Tests/BasicTests/TwoClientTests.cs rename to Tests/CodexTests/BasicTests/TwoClientTests.cs diff --git a/Tests/CodexDistTest.cs b/Tests/CodexTests/CodexDistTest.cs similarity index 100% rename from Tests/CodexDistTest.cs rename to Tests/CodexTests/CodexDistTest.cs diff --git a/Tests/Tests.csproj b/Tests/CodexTests/CodexTests.csproj similarity index 100% rename from Tests/Tests.csproj rename to Tests/CodexTests/CodexTests.csproj diff --git a/Tests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs b/Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs similarity index 100% rename from Tests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs rename to Tests/CodexTests/DownloadConnectivityTests/FullyConnectedDownloadTests.cs diff --git a/Tests/Helpers/FullConnectivityHelper.cs b/Tests/CodexTests/Helpers/FullConnectivityHelper.cs similarity index 100% rename from Tests/Helpers/FullConnectivityHelper.cs rename to Tests/CodexTests/Helpers/FullConnectivityHelper.cs diff --git a/Tests/Helpers/PeerConnectionTestHelpers.cs b/Tests/CodexTests/Helpers/PeerConnectionTestHelpers.cs similarity index 100% rename from Tests/Helpers/PeerConnectionTestHelpers.cs rename to Tests/CodexTests/Helpers/PeerConnectionTestHelpers.cs diff --git a/Tests/Helpers/PeerDownloadTestHelpers.cs b/Tests/CodexTests/Helpers/PeerDownloadTestHelpers.cs similarity index 100% rename from Tests/Helpers/PeerDownloadTestHelpers.cs rename to Tests/CodexTests/Helpers/PeerDownloadTestHelpers.cs diff --git a/Tests/MetricsAccessExtensions.cs b/Tests/CodexTests/MetricsAccessExtensions.cs similarity index 100% rename from Tests/MetricsAccessExtensions.cs rename to Tests/CodexTests/MetricsAccessExtensions.cs diff --git a/Tests/Parallelism.cs b/Tests/CodexTests/Parallelism.cs similarity index 100% rename from Tests/Parallelism.cs rename to Tests/CodexTests/Parallelism.cs diff --git a/Tests/PeerDiscoveryTests/LayeredDiscoveryTests.cs b/Tests/CodexTests/PeerDiscoveryTests/LayeredDiscoveryTests.cs similarity index 100% rename from Tests/PeerDiscoveryTests/LayeredDiscoveryTests.cs rename to Tests/CodexTests/PeerDiscoveryTests/LayeredDiscoveryTests.cs diff --git a/Tests/PeerDiscoveryTests/PeerDiscoveryTests.cs b/Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs similarity index 100% rename from Tests/PeerDiscoveryTests/PeerDiscoveryTests.cs rename to Tests/CodexTests/PeerDiscoveryTests/PeerDiscoveryTests.cs diff --git a/DistTestCore/Configuration.cs b/Tests/DistTestCore/Configuration.cs similarity index 100% rename from DistTestCore/Configuration.cs rename to Tests/DistTestCore/Configuration.cs diff --git a/DistTestCore/DistTest.cs b/Tests/DistTestCore/DistTest.cs similarity index 99% rename from DistTestCore/DistTest.cs rename to Tests/DistTestCore/DistTest.cs index 5555ed80..a1a4ef5d 100644 --- a/DistTestCore/DistTest.cs +++ b/Tests/DistTestCore/DistTest.cs @@ -1,9 +1,11 @@ using Core; +using DistTestCore.Logs; using FileUtils; using Logging; using NUnit.Framework; using System.Reflection; using Utils; +using Assert = NUnit.Framework.Assert; namespace DistTestCore { diff --git a/DistTestCore/DistTestCore.csproj b/Tests/DistTestCore/DistTestCore.csproj similarity index 100% rename from DistTestCore/DistTestCore.csproj rename to Tests/DistTestCore/DistTestCore.csproj diff --git a/DistTestCore/DontDownloadLogsOnFailureAttribute.cs b/Tests/DistTestCore/DontDownloadLogsOnFailureAttribute.cs similarity index 100% rename from DistTestCore/DontDownloadLogsOnFailureAttribute.cs rename to Tests/DistTestCore/DontDownloadLogsOnFailureAttribute.cs diff --git a/DistTestCore/DownloadedLogExtensions.cs b/Tests/DistTestCore/DownloadedLogExtensions.cs similarity index 100% rename from DistTestCore/DownloadedLogExtensions.cs rename to Tests/DistTestCore/DownloadedLogExtensions.cs diff --git a/DistTestCore/Helpers/AssertHelpers.cs b/Tests/DistTestCore/Helpers/AssertHelpers.cs similarity index 100% rename from DistTestCore/Helpers/AssertHelpers.cs rename to Tests/DistTestCore/Helpers/AssertHelpers.cs diff --git a/Logging/BaseTestLog.cs b/Tests/DistTestCore/Logs/BaseTestLog.cs similarity index 52% rename from Logging/BaseTestLog.cs rename to Tests/DistTestCore/Logs/BaseTestLog.cs index 99f1eb18..99cd0f14 100644 --- a/Logging/BaseTestLog.cs +++ b/Tests/DistTestCore/Logs/BaseTestLog.cs @@ -1,4 +1,6 @@ -namespace Logging +using Logging; + +namespace DistTestCore.Logs { public abstract class BaseTestLog : BaseLog { @@ -9,6 +11,14 @@ { } + public void WriteLogTag() + { + var runId = NameUtils.GetRunId(); + var category = NameUtils.GetCategoryName(); + var name = NameUtils.GetTestMethodName(); + LogFile.WriteRaw($"{runId} {category} {name}"); + } + public void MarkAsFailed() { if (hasFailed) return; diff --git a/Logging/FixtureLog.cs b/Tests/DistTestCore/Logs/FixtureLog.cs similarity index 93% rename from Logging/FixtureLog.cs rename to Tests/DistTestCore/Logs/FixtureLog.cs index 306b40a9..c32ce87d 100644 --- a/Logging/FixtureLog.cs +++ b/Tests/DistTestCore/Logs/FixtureLog.cs @@ -1,4 +1,6 @@ -namespace Logging +using Logging; + +namespace DistTestCore.Logs { public class FixtureLog : BaseTestLog { diff --git a/DistTestCore/StatusLog.cs b/Tests/DistTestCore/Logs/StatusLog.cs similarity index 98% rename from DistTestCore/StatusLog.cs rename to Tests/DistTestCore/Logs/StatusLog.cs index e937469b..b7ce8913 100644 --- a/DistTestCore/StatusLog.cs +++ b/Tests/DistTestCore/Logs/StatusLog.cs @@ -1,7 +1,7 @@ using Logging; using Newtonsoft.Json; -namespace DistTestCore +namespace DistTestCore.Logs { public class StatusLog { diff --git a/Logging/TestLog.cs b/Tests/DistTestCore/Logs/TestLog.cs similarity index 94% rename from Logging/TestLog.cs rename to Tests/DistTestCore/Logs/TestLog.cs index 217a7554..0f8831b6 100644 --- a/Logging/TestLog.cs +++ b/Tests/DistTestCore/Logs/TestLog.cs @@ -1,4 +1,4 @@ -namespace Logging +namespace DistTestCore.Logs { public class TestLog : BaseTestLog { diff --git a/DistTestCore/LongTimeSet.cs b/Tests/DistTestCore/LongTimeSet.cs similarity index 100% rename from DistTestCore/LongTimeSet.cs rename to Tests/DistTestCore/LongTimeSet.cs diff --git a/DistTestCore/LongTimeoutsTestAttribute.cs b/Tests/DistTestCore/LongTimeoutsTestAttribute.cs similarity index 100% rename from DistTestCore/LongTimeoutsTestAttribute.cs rename to Tests/DistTestCore/LongTimeoutsTestAttribute.cs diff --git a/Logging/NameUtils.cs b/Tests/DistTestCore/NameUtils.cs similarity index 97% rename from Logging/NameUtils.cs rename to Tests/DistTestCore/NameUtils.cs index 2ca47e20..fea549d2 100644 --- a/Logging/NameUtils.cs +++ b/Tests/DistTestCore/NameUtils.cs @@ -1,6 +1,7 @@ -using NUnit.Framework; +using Logging; +using NUnit.Framework; -namespace Logging +namespace DistTestCore { public static class NameUtils { diff --git a/DistTestCore/TestLifecycle.cs b/Tests/DistTestCore/TestLifecycle.cs similarity index 99% rename from DistTestCore/TestLifecycle.cs rename to Tests/DistTestCore/TestLifecycle.cs index 1ceea347..1f5bf171 100644 --- a/DistTestCore/TestLifecycle.cs +++ b/Tests/DistTestCore/TestLifecycle.cs @@ -1,7 +1,7 @@ using Core; +using DistTestCore.Logs; using FileUtils; using KubernetesWorkflow; -using Logging; using Utils; namespace DistTestCore diff --git a/CodexNetDeployer/CodexNetDeployer.csproj b/Tools/CodexNetDeployer/CodexNetDeployer.csproj similarity index 100% rename from CodexNetDeployer/CodexNetDeployer.csproj rename to Tools/CodexNetDeployer/CodexNetDeployer.csproj diff --git a/CodexNetDeployer/CodexNodeStarter.cs b/Tools/CodexNetDeployer/CodexNodeStarter.cs similarity index 100% rename from CodexNetDeployer/CodexNodeStarter.cs rename to Tools/CodexNetDeployer/CodexNodeStarter.cs diff --git a/CodexNetDeployer/Configuration.cs b/Tools/CodexNetDeployer/Configuration.cs similarity index 100% rename from CodexNetDeployer/Configuration.cs rename to Tools/CodexNetDeployer/Configuration.cs diff --git a/CodexNetDeployer/Deployer.cs b/Tools/CodexNetDeployer/Deployer.cs similarity index 100% rename from CodexNetDeployer/Deployer.cs rename to Tools/CodexNetDeployer/Deployer.cs diff --git a/CodexNetDeployer/PeerConnectivityChecker.cs b/Tools/CodexNetDeployer/PeerConnectivityChecker.cs similarity index 100% rename from CodexNetDeployer/PeerConnectivityChecker.cs rename to Tools/CodexNetDeployer/PeerConnectivityChecker.cs diff --git a/CodexNetDeployer/Program.cs b/Tools/CodexNetDeployer/Program.cs similarity index 100% rename from CodexNetDeployer/Program.cs rename to Tools/CodexNetDeployer/Program.cs diff --git a/CodexNetDeployer/deploy-continuous-testnet.sh b/Tools/CodexNetDeployer/deploy-continuous-testnet.sh similarity index 100% rename from CodexNetDeployer/deploy-continuous-testnet.sh rename to Tools/CodexNetDeployer/deploy-continuous-testnet.sh diff --git a/CodexNetDownloader/CodexNetDownloader.csproj b/Tools/CodexNetDownloader/CodexNetDownloader.csproj similarity index 100% rename from CodexNetDownloader/CodexNetDownloader.csproj rename to Tools/CodexNetDownloader/CodexNetDownloader.csproj diff --git a/CodexNetDownloader/Configuration.cs b/Tools/CodexNetDownloader/Configuration.cs similarity index 100% rename from CodexNetDownloader/Configuration.cs rename to Tools/CodexNetDownloader/Configuration.cs diff --git a/CodexNetDownloader/Program.cs b/Tools/CodexNetDownloader/Program.cs similarity index 100% rename from CodexNetDownloader/Program.cs rename to Tools/CodexNetDownloader/Program.cs diff --git a/cs-codex-dist-testing.sln b/cs-codex-dist-testing.sln index 92e1c82d..12dea0f2 100644 --- a/cs-codex-dist-testing.sln +++ b/cs-codex-dist-testing.sln @@ -3,37 +3,47 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{57F57B85-A537-4D3A-B7AE-B72C66B74AAB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{88C2A621-8A98-4D07-8625-7900FC8EF89E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistTestCore", "DistTestCore\DistTestCore.csproj", "{47F31305-6E68-4827-8E39-7B41DAA1CE7A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{7591C5B3-D86E-4AE4-8ED2-B272D17FE7E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesWorkflow", "KubernetesWorkflow\KubernetesWorkflow.csproj", "{359123AA-3D9B-4442-80F4-19E32E3EC9EA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "Utils\Utils.csproj", "{957DE3B8-9571-450A-8609-B267DCA8727C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectPlugins", "ProjectPlugins", "{8F1F1C2A-E313-4E0C-BE40-58FB0BA91124}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging", "Logging\Logging.csproj", "{8481A4A6-4BDD-41B0-A3EB-EF53F7BD40D1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgsUniform", "Framework\ArgsUniform\ArgsUniform.csproj", "{9922732F-01B3-4DBB-ADEC-E5451AB90CEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NethereumWorkflow", "Nethereum\NethereumWorkflow.csproj", "{D6C3555E-D52D-4993-A87B-71AB650398FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Framework\Core\Core.csproj", "{D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ContinuousTests", "ContinuousTests\ContinuousTests.csproj", "{025B7074-0A09-4FCC-9BB9-03AE2A961EA1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileUtils", "Framework\FileUtils\FileUtils.csproj", "{D10125E6-FF03-4292-A22C-9D622B2ACEDE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexNetDeployer", "CodexNetDeployer\CodexNetDeployer.csproj", "{871CAF12-14BE-4509-BC6E-20FDF0B1083A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KubernetesWorkflow", "Framework\KubernetesWorkflow\KubernetesWorkflow.csproj", "{98198410-71F9-4498-8550-E6F08B1FC4FA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgsUniform", "ArgsUniform\ArgsUniform.csproj", "{634324B1-E359-42B4-A269-BDC429936B3C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging", "Framework\Logging\Logging.csproj", "{4FB7FC96-CB01-4905-9E40-3768692EDC0A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexNetDownloader", "CodexNetDownloader\CodexNetDownloader.csproj", "{6CDF35D2-906A-4285-8E1F-4794588B948B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NethereumWorkflow", "Framework\NethereumWorkflow\NethereumWorkflow.csproj", "{70CFFF7A-FA63-48DB-B304-8C859998F339}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileUtils", "FileUtils\FileUtils.csproj", "{ECC954DA-8D4E-49EE-83AD-80085A43DEEB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "Framework\Utils\Utils.csproj", "{8D264872-5361-4AC5-8A99-908137E13A22}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexPlugin", "CodexPlugin\CodexPlugin.csproj", "{DE4E802C-288C-45C4-84B6-8A5A6A96EF49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexContractsPlugin", "ProjectPlugins\CodexContractsPlugin\CodexContractsPlugin.csproj", "{65D97CC1-E566-423E-9BD8-A1FA936CAAFA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{F2BF34B3-C660-43EF-BD42-BC5C60237FC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexPlugin", "ProjectPlugins\CodexPlugin\CodexPlugin.csproj", "{F36DFCB1-C33F-426B-851B-FB1DEE7F028E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetricsPlugin", "MetricsPlugin\MetricsPlugin.csproj", "{FCC74AF1-463D-4E5A-9FE7-B4A13F7C8820}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GethPlugin", "ProjectPlugins\GethPlugin\GethPlugin.csproj", "{8B39F251-F948-40AE-8922-3D8C4E529A86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GethPlugin", "GethPlugin\GethPlugin.csproj", "{5A1EF1DD-9E81-4501-B44C-493C72D2B166}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetricsPlugin", "ProjectPlugins\MetricsPlugin\MetricsPlugin.csproj", "{8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodexContractsPlugin", "CodexContractsPlugin\CodexContractsPlugin.csproj", "{F315AEB1-C254-45FD-A0D2-5CEF401E0442}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexContinuousTests", "Tests\CodexContinuousTests\CodexContinuousTests.csproj", "{ADEC06CF-6F3A-44C5-AA57-EAB94124AC82}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexTestsLong", "Tests\CodexLongTests\CodexTestsLong.csproj", "{0C2D067F-053C-45A8-AE0D-4EB388E77C89}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexTests", "Tests\CodexTests\CodexTests.csproj", "{562EC700-6984-4C9A-83BF-3BF4E3EB1A64}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DistTestCore", "Tests\DistTestCore\DistTestCore.csproj", "{E849B7BA-FDCC-4CFF-998F-845ED2F1BF40}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexNetDeployer", "Tools\CodexNetDeployer\CodexNetDeployer.csproj", "{3417D508-E2F4-4974-8988-BB124046D9E2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodexNetDownloader", "Tools\CodexNetDownloader\CodexNetDownloader.csproj", "{8BB4E60B-2381-436C-BDA9-72D2A31F8DFA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,74 +51,97 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {57F57B85-A537-4D3A-B7AE-B72C66B74AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57F57B85-A537-4D3A-B7AE-B72C66B74AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57F57B85-A537-4D3A-B7AE-B72C66B74AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57F57B85-A537-4D3A-B7AE-B72C66B74AAB}.Release|Any CPU.Build.0 = Release|Any CPU - {47F31305-6E68-4827-8E39-7B41DAA1CE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47F31305-6E68-4827-8E39-7B41DAA1CE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47F31305-6E68-4827-8E39-7B41DAA1CE7A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47F31305-6E68-4827-8E39-7B41DAA1CE7A}.Release|Any CPU.Build.0 = Release|Any CPU - {359123AA-3D9B-4442-80F4-19E32E3EC9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {359123AA-3D9B-4442-80F4-19E32E3EC9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {359123AA-3D9B-4442-80F4-19E32E3EC9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {359123AA-3D9B-4442-80F4-19E32E3EC9EA}.Release|Any CPU.Build.0 = Release|Any CPU - {957DE3B8-9571-450A-8609-B267DCA8727C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {957DE3B8-9571-450A-8609-B267DCA8727C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {957DE3B8-9571-450A-8609-B267DCA8727C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {957DE3B8-9571-450A-8609-B267DCA8727C}.Release|Any CPU.Build.0 = Release|Any CPU - {8481A4A6-4BDD-41B0-A3EB-EF53F7BD40D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8481A4A6-4BDD-41B0-A3EB-EF53F7BD40D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8481A4A6-4BDD-41B0-A3EB-EF53F7BD40D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8481A4A6-4BDD-41B0-A3EB-EF53F7BD40D1}.Release|Any CPU.Build.0 = Release|Any CPU - {D6C3555E-D52D-4993-A87B-71AB650398FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D6C3555E-D52D-4993-A87B-71AB650398FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D6C3555E-D52D-4993-A87B-71AB650398FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D6C3555E-D52D-4993-A87B-71AB650398FD}.Release|Any CPU.Build.0 = Release|Any CPU - {025B7074-0A09-4FCC-9BB9-03AE2A961EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {025B7074-0A09-4FCC-9BB9-03AE2A961EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {025B7074-0A09-4FCC-9BB9-03AE2A961EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {025B7074-0A09-4FCC-9BB9-03AE2A961EA1}.Release|Any CPU.Build.0 = Release|Any CPU - {871CAF12-14BE-4509-BC6E-20FDF0B1083A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {871CAF12-14BE-4509-BC6E-20FDF0B1083A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {871CAF12-14BE-4509-BC6E-20FDF0B1083A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {871CAF12-14BE-4509-BC6E-20FDF0B1083A}.Release|Any CPU.Build.0 = Release|Any CPU - {634324B1-E359-42B4-A269-BDC429936B3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {634324B1-E359-42B4-A269-BDC429936B3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {634324B1-E359-42B4-A269-BDC429936B3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {634324B1-E359-42B4-A269-BDC429936B3C}.Release|Any CPU.Build.0 = Release|Any CPU - {6CDF35D2-906A-4285-8E1F-4794588B948B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6CDF35D2-906A-4285-8E1F-4794588B948B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6CDF35D2-906A-4285-8E1F-4794588B948B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CDF35D2-906A-4285-8E1F-4794588B948B}.Release|Any CPU.Build.0 = Release|Any CPU - {ECC954DA-8D4E-49EE-83AD-80085A43DEEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECC954DA-8D4E-49EE-83AD-80085A43DEEB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECC954DA-8D4E-49EE-83AD-80085A43DEEB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECC954DA-8D4E-49EE-83AD-80085A43DEEB}.Release|Any CPU.Build.0 = Release|Any CPU - {DE4E802C-288C-45C4-84B6-8A5A6A96EF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE4E802C-288C-45C4-84B6-8A5A6A96EF49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE4E802C-288C-45C4-84B6-8A5A6A96EF49}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE4E802C-288C-45C4-84B6-8A5A6A96EF49}.Release|Any CPU.Build.0 = Release|Any CPU - {F2BF34B3-C660-43EF-BD42-BC5C60237FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2BF34B3-C660-43EF-BD42-BC5C60237FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2BF34B3-C660-43EF-BD42-BC5C60237FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2BF34B3-C660-43EF-BD42-BC5C60237FC4}.Release|Any CPU.Build.0 = Release|Any CPU - {FCC74AF1-463D-4E5A-9FE7-B4A13F7C8820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCC74AF1-463D-4E5A-9FE7-B4A13F7C8820}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCC74AF1-463D-4E5A-9FE7-B4A13F7C8820}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCC74AF1-463D-4E5A-9FE7-B4A13F7C8820}.Release|Any CPU.Build.0 = Release|Any CPU - {5A1EF1DD-9E81-4501-B44C-493C72D2B166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A1EF1DD-9E81-4501-B44C-493C72D2B166}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A1EF1DD-9E81-4501-B44C-493C72D2B166}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A1EF1DD-9E81-4501-B44C-493C72D2B166}.Release|Any CPU.Build.0 = Release|Any CPU - {F315AEB1-C254-45FD-A0D2-5CEF401E0442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F315AEB1-C254-45FD-A0D2-5CEF401E0442}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F315AEB1-C254-45FD-A0D2-5CEF401E0442}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F315AEB1-C254-45FD-A0D2-5CEF401E0442}.Release|Any CPU.Build.0 = Release|Any CPU + {9922732F-01B3-4DBB-ADEC-E5451AB90CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9922732F-01B3-4DBB-ADEC-E5451AB90CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9922732F-01B3-4DBB-ADEC-E5451AB90CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9922732F-01B3-4DBB-ADEC-E5451AB90CEE}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9}.Release|Any CPU.Build.0 = Release|Any CPU + {D10125E6-FF03-4292-A22C-9D622B2ACEDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D10125E6-FF03-4292-A22C-9D622B2ACEDE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D10125E6-FF03-4292-A22C-9D622B2ACEDE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D10125E6-FF03-4292-A22C-9D622B2ACEDE}.Release|Any CPU.Build.0 = Release|Any CPU + {98198410-71F9-4498-8550-E6F08B1FC4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98198410-71F9-4498-8550-E6F08B1FC4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98198410-71F9-4498-8550-E6F08B1FC4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98198410-71F9-4498-8550-E6F08B1FC4FA}.Release|Any CPU.Build.0 = Release|Any CPU + {4FB7FC96-CB01-4905-9E40-3768692EDC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FB7FC96-CB01-4905-9E40-3768692EDC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FB7FC96-CB01-4905-9E40-3768692EDC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FB7FC96-CB01-4905-9E40-3768692EDC0A}.Release|Any CPU.Build.0 = Release|Any CPU + {70CFFF7A-FA63-48DB-B304-8C859998F339}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70CFFF7A-FA63-48DB-B304-8C859998F339}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70CFFF7A-FA63-48DB-B304-8C859998F339}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70CFFF7A-FA63-48DB-B304-8C859998F339}.Release|Any CPU.Build.0 = Release|Any CPU + {8D264872-5361-4AC5-8A99-908137E13A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D264872-5361-4AC5-8A99-908137E13A22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D264872-5361-4AC5-8A99-908137E13A22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D264872-5361-4AC5-8A99-908137E13A22}.Release|Any CPU.Build.0 = Release|Any CPU + {65D97CC1-E566-423E-9BD8-A1FA936CAAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65D97CC1-E566-423E-9BD8-A1FA936CAAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65D97CC1-E566-423E-9BD8-A1FA936CAAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65D97CC1-E566-423E-9BD8-A1FA936CAAFA}.Release|Any CPU.Build.0 = Release|Any CPU + {F36DFCB1-C33F-426B-851B-FB1DEE7F028E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F36DFCB1-C33F-426B-851B-FB1DEE7F028E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F36DFCB1-C33F-426B-851B-FB1DEE7F028E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F36DFCB1-C33F-426B-851B-FB1DEE7F028E}.Release|Any CPU.Build.0 = Release|Any CPU + {8B39F251-F948-40AE-8922-3D8C4E529A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B39F251-F948-40AE-8922-3D8C4E529A86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B39F251-F948-40AE-8922-3D8C4E529A86}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B39F251-F948-40AE-8922-3D8C4E529A86}.Release|Any CPU.Build.0 = Release|Any CPU + {8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97}.Release|Any CPU.Build.0 = Release|Any CPU + {ADEC06CF-6F3A-44C5-AA57-EAB94124AC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADEC06CF-6F3A-44C5-AA57-EAB94124AC82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADEC06CF-6F3A-44C5-AA57-EAB94124AC82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADEC06CF-6F3A-44C5-AA57-EAB94124AC82}.Release|Any CPU.Build.0 = Release|Any CPU + {0C2D067F-053C-45A8-AE0D-4EB388E77C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C2D067F-053C-45A8-AE0D-4EB388E77C89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C2D067F-053C-45A8-AE0D-4EB388E77C89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C2D067F-053C-45A8-AE0D-4EB388E77C89}.Release|Any CPU.Build.0 = Release|Any CPU + {562EC700-6984-4C9A-83BF-3BF4E3EB1A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {562EC700-6984-4C9A-83BF-3BF4E3EB1A64}.Debug|Any CPU.Build.0 = Debug|Any CPU + {562EC700-6984-4C9A-83BF-3BF4E3EB1A64}.Release|Any CPU.ActiveCfg = Release|Any CPU + {562EC700-6984-4C9A-83BF-3BF4E3EB1A64}.Release|Any CPU.Build.0 = Release|Any CPU + {E849B7BA-FDCC-4CFF-998F-845ED2F1BF40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E849B7BA-FDCC-4CFF-998F-845ED2F1BF40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E849B7BA-FDCC-4CFF-998F-845ED2F1BF40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E849B7BA-FDCC-4CFF-998F-845ED2F1BF40}.Release|Any CPU.Build.0 = Release|Any CPU + {3417D508-E2F4-4974-8988-BB124046D9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3417D508-E2F4-4974-8988-BB124046D9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3417D508-E2F4-4974-8988-BB124046D9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3417D508-E2F4-4974-8988-BB124046D9E2}.Release|Any CPU.Build.0 = Release|Any CPU + {8BB4E60B-2381-436C-BDA9-72D2A31F8DFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB4E60B-2381-436C-BDA9-72D2A31F8DFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB4E60B-2381-436C-BDA9-72D2A31F8DFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB4E60B-2381-436C-BDA9-72D2A31F8DFA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9922732F-01B3-4DBB-ADEC-E5451AB90CEE} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {D5E952BA-DCB1-4EA8-A038-6E2E0FCD64D9} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {D10125E6-FF03-4292-A22C-9D622B2ACEDE} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {98198410-71F9-4498-8550-E6F08B1FC4FA} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {4FB7FC96-CB01-4905-9E40-3768692EDC0A} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {70CFFF7A-FA63-48DB-B304-8C859998F339} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {8D264872-5361-4AC5-8A99-908137E13A22} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7} + {65D97CC1-E566-423E-9BD8-A1FA936CAAFA} = {8F1F1C2A-E313-4E0C-BE40-58FB0BA91124} + {F36DFCB1-C33F-426B-851B-FB1DEE7F028E} = {8F1F1C2A-E313-4E0C-BE40-58FB0BA91124} + {8B39F251-F948-40AE-8922-3D8C4E529A86} = {8F1F1C2A-E313-4E0C-BE40-58FB0BA91124} + {8DE8FF65-23CB-4FB3-8BE5-6C0BEC4BAA97} = {8F1F1C2A-E313-4E0C-BE40-58FB0BA91124} + {ADEC06CF-6F3A-44C5-AA57-EAB94124AC82} = {88C2A621-8A98-4D07-8625-7900FC8EF89E} + {0C2D067F-053C-45A8-AE0D-4EB388E77C89} = {88C2A621-8A98-4D07-8625-7900FC8EF89E} + {562EC700-6984-4C9A-83BF-3BF4E3EB1A64} = {88C2A621-8A98-4D07-8625-7900FC8EF89E} + {E849B7BA-FDCC-4CFF-998F-845ED2F1BF40} = {88C2A621-8A98-4D07-8625-7900FC8EF89E} + {3417D508-E2F4-4974-8988-BB124046D9E2} = {7591C5B3-D86E-4AE4-8ED2-B272D17FE7E3} + {8BB4E60B-2381-436C-BDA9-72D2A31F8DFA} = {7591C5B3-D86E-4AE4-8ED2-B272D17FE7E3} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {237BF0AA-9EC4-4659-AD9A-65DEB974250C} EndGlobalSection