gh-65 Fix unit test

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

Author: mocsharp

.github/workflows/ci.yml

@@ -137,39 +137,20 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
         working-directory: ./src
-
-      - name: Begin SonarScanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        shell: powershell
-        run: .\.sonar\scanner\dotnet-sonarscanner begin /k:"Project-MONAI_monai-deploy-informatics-gateway" /o:"project-monai" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="src\${{ env.TEST_RESULTS }}\**\*.xml"
 
-      - name: Build
+      - name: Build & Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
-        run: dotnet build -c ${{ env.BUILD_CONFIG }} --nologo "${{ env.SOLUTION }}"
-        working-directory: ./src
+        run: |
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"Project-MONAI_monai-deploy-informatics-gateway" /o:"project-monai" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="src\${{ env.TEST_RESULTS }}\**\*.xml"
+          pushd src
+          dotnet build -c ${{ env.BUILD_CONFIG }} --nologo "${{ env.SOLUTION }}"
+          Get-ChildItem -Recurse | Where-Object { $_.Name -like "*Test.csproj" } | ForEach-Object {  dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal -r "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings $_.FullName }
+          popd
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
           
-      - name: Test
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        shell: powershell
-        run: Get-ChildItem -Recurse | Where-Object { $_.Name -like "*Test.csproj" } | ForEach-Object {  dotnet test -c ${{ env.BUILD_CONFIG }} -v=minimal -r "${{ env.TEST_RESULTS }}" --collect:"XPlat Code Coverage" --settings coverlet.runsettings $_.FullName }
-        working-directory: ./src
-
-
-      - name: End SonarScanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        shell: powershell
-        run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
-        
-
       - uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

src/InformaticsGateway/Test/Services/Scp/ScpServiceTest.cs

@@ -56,6 +56,8 @@ public ScpServiceTest()
             _loggerFactory.Setup(p => p.CreateLogger(It.IsAny<string>())).Returns(_logger.Object);
             _associationDataProvider.Setup(p => p.GetLogger(It.IsAny<string>())).Returns(_loggerInternal.Object);
             _associationDataProvider.Setup(p => p.Configuration).Returns(_configuration);
+            _logger.Setup(p => p.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
+            _loggerInternal.Setup(p => p.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
         }
 
         [RetryFact(5, 250, DisplayName = "StartAsync - shall stop application if failed to start SCP listner")]
@@ -107,7 +109,7 @@ public async Task CEcho_ShallRejectCEchoRequests()
             Assert.Equal(DicomRejectSource.ServiceUser, exception.RejectSource);
             Assert.Equal(DicomRejectResult.Permanent, exception.RejectResult);
 
-            _loggerInternal.VerifyLogging($"Verification service is disabled: rejecting association", LogLevel.Warning, Times.Once());
+            _loggerInternal.VerifyLogging($"Verification service is disabled: rejecting association.", LogLevel.Warning, Times.Once());
 
             Assert.True(countdownEvent.Wait(1000));
         }
@@ -367,7 +369,7 @@ public async Task CStore_OnClientAbort()
 
             await client.SendAsync(_cancellationTokenSource.Token, DicomClientCancellationMode.ImmediatelyAbortAssociation);
             Assert.True(countdownEvent.Wait(2000));
-            _loggerInternal.VerifyLogging($"Aborted {DicomAbortSource.ServiceUser} with reason {DicomAbortReason.NotSpecified}", LogLevel.Warning, Times.Once());
+            _loggerInternal.VerifyLogging($"Aborted {DicomAbortSource.ServiceUser} with reason {DicomAbortReason.NotSpecified}.", LogLevel.Warning, Times.Once());
         }
 
         private ScpService CreateService()

src/InformaticsGateway/Test/Services/Storage/SpaceReclaimerServiceTest.cs

@@ -60,7 +60,7 @@ public async Task ShallHonorCancellationRequest()
             _logger.VerifyLogging("Space Reclaimer Service is stopping.", LogLevel.Information, Times.Once());
         }
 
-        [RetryFact(5, 250, DisplayName = "Shall delete files")]
+        [RetryFact(10, 250, DisplayName = "Shall delete files")]
         public async Task ShallDeleteFiles()
         {
             var files = new List<FileStorageInfo>() {
@@ -96,6 +96,7 @@ public async Task ShallDeleteFiles()
             {
                 Assert.False(_fileSystem.File.Exists(file.FilePath));
             }
+            Assert.False(_fileSystem.Directory.Exists("/payloads/dir1"));
             Assert.True(_fileSystem.Directory.Exists("/payloads"));
 
             _logger.VerifyLogging("Space Reclaimer Service canceled.", LogLevel.Warning, Times.Once());