unit test case addition to imrove code coverage

src/ArtifactoryUploader/Program.cs

@@ -24,10 +24,11 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using LCT.Common.Model;
-using LCT.ArtifactPublisher;
+using System.Diagnostics.CodeAnalysis;
 
 namespace ArtifactoryUploader
 {
+    [ExcludeFromCodeCoverage]
     public static class Program
     {
         private static bool m_Verbose = false;

src/LCT.PackageIdentifier.UTest/BomValidatorUnitTests.cs

@@ -53,6 +53,7 @@ public async Task ValidateAppSettings_ProvidedProjectID_ReturnsProjectName()
             mockISw360ProjectService.Verify(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<string>(), It.IsAny<string>(), projectReleases), Times.AtLeastOnce);
 
         }
+
         [TestCase]
         public Task ValidateAppSettings_ProvidedProjectID_ReturnsInvalidDataException()
         {
@@ -78,5 +79,36 @@ public Task ValidateAppSettings_ProvidedProjectID_ReturnsInvalidDataException()
             Assert.ThrowsAsync<InvalidDataException>(async () => await BomValidator.ValidateAppSettings(CommonAppSettings, mockISw360ProjectService.Object, projectReleases));
             return Task.CompletedTask;
         }
+
+        [TestCase]
+        public async Task ValidateAppSettings_ProvidedProjectID_EndsTheApplicationOnClosedProject()
+        {
+            //Arrange
+            string projectName = "Test";
+            ProjectReleases projectReleases = new ProjectReleases();
+            projectReleases.clearingState = "CLOSED";
+            var CommonAppSettings = new CommonAppSettings(mockIFolderAction.Object)
+            {
+                SW360ProjectName = "Test"
+            };
+            mockISw360ProjectService.Setup(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<String>(), It.IsAny<string>(), projectReleases))
+                .ReturnsAsync(projectName);
+
+            mockIFileOperations.Setup(x => x.ValidateFilePath(It.IsAny<string>()))
+                .Callback((string message) => { })
+                .Verifiable();
+
+            mockIFolderAction.Setup(x => x.ValidateFolderPath(It.IsAny<string>()))
+                .Callback((string message) => { })
+                .Verifiable();
+            CommonAppSettings.PackageFilePath = "";
+
+            //Act
+            await BomValidator.ValidateAppSettings(CommonAppSettings, mockISw360ProjectService.Object, projectReleases);
+
+            //Assert
+            mockISw360ProjectService.Verify(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<string>(), It.IsAny<string>(), projectReleases), Times.AtLeastOnce);
+
+        }
     }
 }

src/LCT.PackageIdentifier/BomHelper.cs

@@ -13,8 +13,10 @@
 using LCT.Services.Interface;
 using log4net;
 using log4net.Core;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -116,6 +118,9 @@ public static string GetHashCodeUsingNpmView(string name, string version)
             hashCode = result?.StdOut;
             return hashCode?.Trim() ?? string.Empty;
         }
+
+        [Obsolete("not used")]
+        [ExcludeFromCodeCoverage]
         public static Result GetDependencyList(string bomFilePath, string depFilePath)
         {
             bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);

src/LCT.PackageIdentifier/BomValidator.cs

@@ -21,7 +21,7 @@ namespace LCT.PackageIdentifier
     public static class BomValidator
     {
         static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public static async Task ValidateAppSettings(CommonAppSettings appSettings, ISw360ProjectService bomService, ProjectReleases projectReleases)
+        public static async Task<int> ValidateAppSettings(CommonAppSettings appSettings, ISw360ProjectService bomService, ProjectReleases projectReleases)
         {
             string sw360ProjectName = await bomService.GetProjectNameByProjectIDFromSW360(appSettings.SW360ProjectID, appSettings.SW360ProjectName,projectReleases);
 
@@ -33,12 +33,13 @@ public static async Task ValidateAppSettings(CommonAppSettings appSettings, ISw3
             {
                 Logger.Error($"Provided Sw360 project is not in active state ,Please make sure you added the correct project details that is in active state..");
                 Logger.Debug($"ValidateAppSettings() : Sw360 project " + projectReleases.Name + " is in " + projectReleases.clearingState + " state.");
-                CommonHelper.CallEnvironmentExit(-1);
+                return -1;
             }
             else
             {
                 appSettings.SW360ProjectName = sw360ProjectName;
             }
+            return 0;
         }
     }
 }

src/LCT.PackageIdentifier/Program.cs

@@ -24,16 +24,16 @@
 using LCT.APICommunications.Interfaces;
 using LCT.APICommunications;
 using LCT.APICommunications.Model;
-using System.Globalization;
 using System.Linq;
-using LCT.ArtifactPublisher;
+using System.Diagnostics.CodeAnalysis;
 
 
 namespace LCT.PackageIdentifier
 {
     /// <summary>
     /// Program class
     /// </summary>
+    [ExcludeFromCodeCoverage]
     public class Program
     {
         private static bool m_Verbose = false;
@@ -155,7 +155,11 @@ private static async Task ValidateAppsettingsFile(CommonAppSettings appSettings,
                 Timeout = appSettings.TimeOut
             };
             ISw360ProjectService sw360ProjectService = new Sw360ProjectService(new SW360ApicommunicationFacade(sw360ConnectionSettings));
-            await BomValidator.ValidateAppSettings(appSettings, sw360ProjectService, projectReleases);
+            int isValid = await BomValidator.ValidateAppSettings(appSettings, sw360ProjectService, projectReleases);
+            if (isValid == -1)
+            {
+                CommonHelper.CallEnvironmentExit(-1);
+            }
         }
         private static string DisplayInclude(CommonAppSettings appSettings)
         {

src/LCT.SW360PackageCreator.UTest/CreatorValidatorTest.cs

@@ -39,10 +39,30 @@ public async Task ValidateAppSettings_TestPositive()
             //Act
             await CreatorValidator.ValidateAppSettings(CommonAppSettings, mockISw360ProjectService.Object,projectReleases);
 
+            //Assert
+            mockISw360ProjectService.Verify(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<string>(), It.IsAny<string>(), projectReleases), Times.AtLeastOnce);
+        }
+
+        [TestCase]
+        public async Task ValidateAppSettings_OnClosedProject_EndsTheApplication()
+        {
+            //Arrange
+            string projectName = "Test";
+            ProjectReleases projectReleases = new ProjectReleases();
+            projectReleases.clearingState = "CLOSED";
+            var CommonAppSettings = new CommonAppSettings();
+            CommonAppSettings.SW360ProjectName = "Test";
+            mockISw360ProjectService.Setup(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<String>(), It.IsAny<string>(), projectReleases))
+                .ReturnsAsync(projectName);
+
+            //Act
+            await CreatorValidator.ValidateAppSettings(CommonAppSettings, mockISw360ProjectService.Object, projectReleases);
+
             //Assert
             mockISw360ProjectService.Verify(x => x.GetProjectNameByProjectIDFromSW360(It.IsAny<string>(), It.IsAny<string>(), projectReleases), Times.AtLeastOnce);
 
         }
+
         [TestCase]
         public void ValidateAppSettings_TestNegative()
         {

src/LCT.SW360PackageCreator.UTest/DebianPackageDownloaderTest.cs

@@ -10,6 +10,7 @@
 using LCT.SW360PackageCreator.Interfaces;
 using Moq;
 using NUnit.Framework;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -133,5 +134,64 @@ public async Task DownloadReleaseAttachmentSourceForDebian_ByRetry_ReturnsEmptyD
             Assert.That(string.IsNullOrEmpty(attachmentUrlList));
         }
 
+        //string attachmentJson = outFolder + @"..\..\..\src\LCT.SW360PackageCreator.UTest\ComponentCreatorUTFiles\Attachment.json";
+        // 
+
+        public void GetPatchedFileFromDownloadedFolder_ProvidedPatchURLs_ReturnsEmptyDownloadPath()
+        {
+            //Arrange
+            Result result = new Result()
+            {
+                ExitCode = 0
+            };
+            string exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+            string outFolder = Path.GetDirectoryName(exePath);
+            string downloadFolderPath = outFolder + @"..\..\..\src\LCT.SW360PackageCreator.UTest\ComponentCreatorUTFiles";
+            // \adduser_3.118-debian10-combined.tar.bz2";
+
+            //Provided patch URLs for applying patch
+            var lstComparisonBomData = new ComparisonBomData()
+            {
+                Name = "dash",
+                Version = ""
+            };
+            string patchedFilePath = string.Empty;
+
+            // ACT
+            patchedFilePath = DebianPackageDownloader.GetPatchedFileFromDownloadedFolder(downloadFolderPath);
+
+            // Assert
+            Assert.That(!string.IsNullOrEmpty(patchedFilePath));
+        }
+
+        [TestCase]
+        public void GetPatchedFileFromDownloadedFolder_ProvidedPatchURLs_ThrowsArgumentException()
+        {
+            // Arrange
+            string patchedFilePath = string.Empty;
+
+            // Act
+            patchedFilePath = DebianPackageDownloader.GetPatchedFileFromDownloadedFolder(null);
+
+            // Assert
+            Assert.That(string.IsNullOrEmpty(patchedFilePath));
+        }
+
+        [TestCase]
+        public void ApplyPatchforComponents_ProvidedPatchURLs_ReturnsEmptyDownloadPath()
+        {
+            //Arrange
+            string actual = string.Empty;
+            Result result = null;
+            Mock<IDebianPatcher> debianPatcher = new Mock<IDebianPatcher>();
+            debianPatcher.Setup(x=>x.ApplyPatch(It.IsAny<ComparisonBomData>(), It.IsAny<string>(),
+                It.IsAny<string>())).Returns(result);
+
+            //Act
+            DebianPackageDownloader debianPackageDownloader = new DebianPackageDownloader(debianPatcher.Object);
+            debianPackageDownloader.ApplyPatchforComponents(new ComparisonBomData() ,string.Empty, string.Empty);
+            //Assert
+            Assert.That(actual!= null);
+        }
     }
 }

src/LCT.SW360PackageCreator.UTest/LCT.SW360PackageCreator.UTest.csproj

@@ -31,6 +31,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Update="ComponentCreatorUTFiles\adduser_3.118-debian10-combined.tar.bz2">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="ComponentCreatorUTFiles\Attachment.json">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>

src/LCT.SW360PackageCreator/CreatorValidator.cs

@@ -21,7 +21,7 @@ namespace LCT.SW360PackageCreator
     public static class CreatorValidator
     {
         static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public static async Task ValidateAppSettings(CommonAppSettings appSettings, ISw360ProjectService sw360ProjectService, ProjectReleases projectReleases)
+        public static async Task<int> ValidateAppSettings(CommonAppSettings appSettings, ISw360ProjectService sw360ProjectService, ProjectReleases projectReleases)
         {
             string sw360ProjectName = await sw360ProjectService.GetProjectNameByProjectIDFromSW360(appSettings.SW360ProjectID, appSettings.SW360ProjectName,projectReleases);
 
@@ -33,12 +33,13 @@ public static async Task ValidateAppSettings(CommonAppSettings appSettings, ISw3
             {
                 Logger.Error($"Provided Sw360 project is not in active state ,Please make sure you added the correct project details that is in active state..");
                 Logger.Debug($"ValidateAppSettings() : Sw360 project " + projectReleases.Name + " is in " + projectReleases.clearingState + " state.");
-                CommonHelper.CallEnvironmentExit(-1);
+                return -1;
             }
             else
             {
                 appSettings.SW360ProjectName = sw360ProjectName;
             }
+            return 0;
         }
     }
 }

src/LCT.SW360PackageCreator/DebianPackageDownloader.cs

@@ -163,7 +163,7 @@ private static async Task<string> DownloadTarFileAndGetPath(ComparisonBomData co
             return downloadPath;
         }
 
-        private string ApplyPatchforComponents(ComparisonBomData component, string localDownloadPath, string fileName)     
+        public string ApplyPatchforComponents(ComparisonBomData component, string localDownloadPath, string fileName)     
         {
             Result result;
             string patchedFile = string.Empty;
@@ -253,7 +253,7 @@ private static void DeletePatchedFolderAndFile(string folderPath, string downloa
             }
         }
 
-        private static string GetPatchedFileFromDownloadedFolder(string currentDownloadFolder)
+        public static string GetPatchedFileFromDownloadedFolder(string currentDownloadFolder)
         {
             string patchedFilePath = string.Empty;
             try

src/LCT.SW360PackageCreator/Program.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -29,6 +30,7 @@ namespace LCT.SW360PackageCreator
     /// <summary>
     /// Program class
     /// </summary>
+    [ExcludeFromCodeCoverage]
     public class Program
     {
         public static Stopwatch CreatorStopWatch { get; set; }
@@ -57,7 +59,11 @@ static async Task Main(string[] args)
 
             string FolderPath = InitiateLogger(appSettings);
             settingsManager.CheckRequiredArgsToRun(appSettings, "Creator");
-            await CreatorValidator.ValidateAppSettings(appSettings, sw360ProjectService, projectReleases);
+            int isValid = await CreatorValidator.ValidateAppSettings(appSettings, sw360ProjectService, projectReleases);
+            if (isValid == -1)
+            {
+                CommonHelper.CallEnvironmentExit(-1);
+            }
 
             Logger.Logger.Log(null, Level.Notice, $"\n====================<<<<< Package creator >>>>>====================", null);
             Logger.Logger.Log(null, Level.Notice, $"\nStart of Package creator execution : {DateTime.Now}", null);