From 36a0d68de86f56cea9d465641c5fca2b3f8c8fcc Mon Sep 17 00:00:00 2001 From: Joss Sparkes Date: Wed, 17 Aug 2022 11:01:02 +0100 Subject: [PATCH] Changed the namespace to be consistent and correct Signed-off-by: Joss Sparkes --- .../IntegrationTests/TaskManager.IntegrationTests/Hooks.cs | 2 +- .../POCO/TestExecutionConfig.cs | 2 +- .../StepDefinitions/ClinicalReviewStepDefinitions.cs | 2 ++ .../TaskManager.IntegrationTests/Support/Assertions.cs | 2 +- .../TaskManager.IntegrationTests/Support/DataHelper.cs | 2 +- .../TaskManager.IntegrationTests/Support/MinioClientUtil.cs | 1 + .../TaskManager.IntegrationTests/Support/MongoClientUtil.cs | 1 + .../Support/RabbitConnectionFactory.cs | 3 ++- .../TaskManager.IntegrationTests/Support/RabbitConsumer.cs | 2 +- .../TaskManager.IntegrationTests/Support/RabbitPublisher.cs | 2 +- .../Support/TaskManagerStartup.cs | 6 +++--- 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs index 978a499dd..a4db4ea45 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Hooks.cs @@ -16,7 +16,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Monai.Deploy.WorkflowManager.IntegrationTests.Support; +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support; using Polly; using Polly.Retry; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs index a4aba1226..62c511bec 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/POCO/TestExecutionConfig.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO { internal static class TestExecutionConfig { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs index 361ec7b39..ca34195b0 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/StepDefinitions/ClinicalReviewStepDefinitions.cs @@ -13,6 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support; + namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.StepDefinitions { [Binding] diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs index 7adde453a..b78ae6253 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/Assertions.cs @@ -19,7 +19,7 @@ using Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Events; using Monai.Deploy.WorkflowManager.TaskManager.API.Models; -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public class Assertions { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs index ddf646698..97d3de67d 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/DataHelper.cs @@ -19,7 +19,7 @@ using Polly; using Polly.Retry; -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public class DataHelper { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs index 72ed7f5de..40dbfde5f 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MinioClientUtil.cs @@ -15,6 +15,7 @@ */ using Minio; +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; using Polly; using Polly.Retry; using System.Reactive.Linq; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MongoClientUtil.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MongoClientUtil.cs index aab3fb75f..a141f1443 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MongoClientUtil.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/MongoClientUtil.cs @@ -15,6 +15,7 @@ */ using Monai.Deploy.WorkflowManager.TaskManager.API.Models; +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; using MongoDB.Driver; using Polly; using Polly.Retry; diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs index fe6b0aafe..198738bc2 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConnectionFactory.cs @@ -14,9 +14,10 @@ * limitations under the License. */ +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; using RabbitMQ.Client; -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public static class RabbitConnectionFactory { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs index d4b909041..09727fee3 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitConsumer.cs @@ -18,7 +18,7 @@ using Newtonsoft.Json; using RabbitMQ.Client; -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public class RabbitConsumer { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs index 4821d1235..507700152 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/RabbitPublisher.cs @@ -17,7 +17,7 @@ using Monai.Deploy.Messaging.Messages; using RabbitMQ.Client; -namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public class RabbitPublisher { diff --git a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs index 9d41fd0dd..7169ac6bc 100644 --- a/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs +++ b/tests/IntegrationTests/TaskManager.IntegrationTests/Support/TaskManagerStartup.cs @@ -32,10 +32,10 @@ using Monai.Deploy.WorkflowManager.TaskManager.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.Database; using Monai.Deploy.WorkflowManager.TaskManager.Database.Options; -using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests; using MongoDB.Driver; - -namespace Monai.Deploy.WorkflowManager.IntegrationTests.Support +using Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.POCO; + +namespace Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.Support { public static class TaskManagerStartup {