gh-165 Fix unit test & rebase conflicts

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs

@@ -161,11 +161,11 @@ public async Task<ActionResult<string>> Create(DestinationApplicationEntity item
             }
             catch (ObjectExistsException ex)
             {
-                return Problem(title: "DICOM destination already exists", statusCode: (int)System.Net.HttpStatusCode.Conflict, detail: ex.Message);
+                return Problem(title: "DICOM destination already exists", statusCode: StatusCodes.Status409Conflict, detail: ex.Message);
             }
             catch (ConfigurationException ex)
             {
-                return Problem(title: "Validation error", statusCode: (int)System.Net.HttpStatusCode.BadRequest, detail: ex.Message);
+                return Problem(title: "Validation error", statusCode: StatusCodes.Status400BadRequest, detail: ex.Message);
             }
             catch (Exception ex)
             {

src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs

@@ -41,7 +41,7 @@
 
 namespace Monai.Deploy.InformaticsGateway.Test.Services.Export
 {
-    public class ScuExportServiceTest : IClassFixture<DicomScpFixture>
+    public class ScuExportServiceTest : IClassFixture<DicomScpFixture>, IDisposable
     {
         private readonly Mock<IStorageService> _storageService;
         private readonly Mock<IMessageBrokerSubscriberService> _messageSubscriberService;
@@ -56,6 +56,7 @@ public class ScuExportServiceTest : IClassFixture<DicomScpFixture>
         private readonly CancellationTokenSource _cancellationTokenSource;
         private readonly DicomScpFixture _dicomScp;
         private readonly int _port = 11104;
+        private bool _disposedValue;
 
         public ScuExportServiceTest(DicomScpFixture dicomScp)
         {
@@ -521,5 +522,25 @@ private async Task StopAndVerify(ScuExportService service)
             _logger.VerifyLogging($"{service.ServiceName} is stopping.", LogLevel.Information, Times.Once());
             Thread.Sleep(500);
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _dicomScp.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/InformaticsGateway/Test/Services/Scu/ScuServiceTest.cs

@@ -30,10 +30,10 @@
 
 namespace Monai.Deploy.InformaticsGateway.Test.Services.Scu
 {
-    public class ScuServiceTest : IClassFixture<DicomScpFixture>
+    public class ScuServiceTest : IClassFixture<DicomScpFixture>, IDisposable
     {
         private readonly DicomScpFixture _dicomScp;
-        private readonly int _port = 11104;
+        private readonly int _port = 11105;
 
         private readonly Mock<IServiceScopeFactory> _serviceScopeFactory;
         private readonly Mock<ILogger<ScuService>> _logger;
@@ -44,6 +44,7 @@ public class ScuServiceTest : IClassFixture<DicomScpFixture>
         private readonly CancellationTokenSource _cancellationTokenSource;
         private readonly ServiceProvider _serviceProvider;
         private readonly Mock<IServiceScope> _serviceScope;
+        private bool _disposedValue;
 
         public ScuServiceTest(DicomScpFixture dicomScp)
         {
@@ -154,5 +155,25 @@ public async Task GivenACEchoRequest_WhenRemoteServerIsUnreachable_ReturnStatusA
             Assert.Equal(ResponseError.Unhandled, response.Error);
             Assert.StartsWith("One or more error", response.Message);
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _dicomScp.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }