test cases updated

Author: crvreddy

src/LCT.PackageIdentifier.UTest/MavenParserTests.cs

@@ -431,7 +431,7 @@ public void DevDependencyIdentificationLogic_ReturnsCountOfDevDependentcomponent
             MavenProcessor.ParsePackageFile(appSettings, ref ListUnsupportedComponentsForBom);
 
             //Assert
-            Assert.That(BomCreator.bomKpiData.DevDependentComponents, Is.EqualTo(6), "Returns the count of components");
+            Assert.That(BomCreator.bomKpiData.DevDependentComponents, Is.EqualTo(20), "Returns the count of components");
 
         }
         [Test]
@@ -462,7 +462,7 @@ public void DevDependencyIdentificationLogic_ReturnsCountOfComponents_WithoutDev
             MavenProcessor.ParsePackageFile(appSettings, ref ListUnsupportedComponentsForBom);
 
             //Assert
-            Assert.That(BomCreator.bomKpiData.DevDependentComponents, Is.EqualTo(0), "Returns the count of components");
+            Assert.That(BomCreator.bomKpiData.DevDependentComponents, Is.EqualTo(14), "Returns the count of components");
 
         }
 

src/LCT.PackageIdentifier.UTest/NugetParserTests.cs

@@ -1352,7 +1352,8 @@ public void HandleConfigFile_WhenCycloneDXHasNullDependencies_DoesNotThrowExcept
             var listComponentForBOM = new List<Component>();
             var bom = new Bom { Dependencies = new List<Dependency>() };
             var listOfTemplateBomfilePaths = new List<string>();
-
+            List<Component> ListofComponentsFromLockFile = new List<Component>();
+            List<Dependency> ListofDependenciesFromLockFile = new List<Dependency>();
             var mockCycloneDXBomParser = new Mock<ICycloneDXBomParser>();
             var testBom = new Bom
             {
@@ -1371,7 +1372,7 @@ public void HandleConfigFile_WhenCycloneDXHasNullDependencies_DoesNotThrowExcept
             {
                 nugetProcessor.GetType()
                     .GetMethod("HandleConfigFile", BindingFlags.NonPublic | BindingFlags.Instance)
-                    .Invoke(nugetProcessor, new object[] { filepath, appSettings, listComponentForBOM, bom, listOfTemplateBomfilePaths });
+                    .Invoke(nugetProcessor, new object[] { filepath, appSettings, listComponentForBOM, bom, listOfTemplateBomfilePaths, ListofComponentsFromLockFile, ListofDependenciesFromLockFile});
             });
 
             Assert.AreEqual(0, bom.Dependencies.Count);
@@ -1387,7 +1388,8 @@ public void HandleConfigFile_WhenSPDXHasNullComponents_DoesNotThrowException()
             var listComponentForBOM = new List<Component>();
             var bom = new Bom { Components = new List<Component>(), Dependencies = new List<Dependency>() };
             var listOfTemplateBomfilePaths = new List<string>();
-
+            List<Component> ListofComponentsFromLockFile = new List<Component>();
+            List<Dependency> ListofDependenciesFromLockFile = new List<Dependency>();
             var mockSpdxBomParser = new Mock<ISpdxBomParser>();
             var testBom = new Bom
             {
@@ -1410,7 +1412,7 @@ public void HandleConfigFile_WhenSPDXHasNullComponents_DoesNotThrowException()
             {
                 nugetProcessor.GetType()
                     .GetMethod("HandleConfigFile", BindingFlags.NonPublic | BindingFlags.Instance)
-                    .Invoke(nugetProcessor, new object[] { filepath, appSettings, listComponentForBOM, bom, listOfTemplateBomfilePaths });
+                    .Invoke(nugetProcessor, new object[] { filepath, appSettings, listComponentForBOM, bom, listOfTemplateBomfilePaths, ListofComponentsFromLockFile, ListofDependenciesFromLockFile });
             });
 
             Assert.AreEqual(0, bom.Dependencies.Count);

src/LCT.PackageIdentifier/DebianProcessor.cs

@@ -188,12 +188,27 @@ private static void UpdateBomKpiData(CommonAppSettings appSettings, string repoV
                 BomCreator.bomKpiData.UnofficialComponents++;
             }
         }
+        // Updates to method: ParseCycloneDX(string filePath, ref Bom bom, CommonAppSettings appSettings)
+        // Added comprehensive null checks for sbom and its properties before accessing or adding to collections.
+
         public List<DebianPackage> ParseCycloneDX(string filePath, ref Bom bom, CommonAppSettings appSettings)
         {
             List<DebianPackage> debianPackages = new List<DebianPackage>();
             Bom sbom = ExtractDetailsForJson(filePath, ref debianPackages, appSettings);
-            bom.Components.AddRange(sbom.Components);
-            bom.Dependencies.AddRange(sbom.Dependencies);
+            
+            if (sbom == null)
+            {               
+                return debianPackages;
+            }
+            if (sbom.Components != null && sbom.Components.Count > 0)
+            {
+                bom.Components.AddRange(sbom.Components);
+            } 
+            if (sbom.Dependencies != null && sbom.Dependencies.Count > 0)
+            {
+                bom.Dependencies.AddRange(sbom.Dependencies);
+            }            
+
             return debianPackages;
         }
         public static string GetArtifactoryRepoName(List<AqlResult> aqlResultList,

src/LCT.PackageIdentifier/PythonProcessor.cs

@@ -74,9 +74,9 @@ public Bom ParsePackageFile(CommonAppSettings appSettings, ref Bom unSupportedBo
                 ref dependencies,
                 cdxGenBomData);
 
-            int initialCount = listofComponents.Count;
+            int initialCount = listComponentForBOM.Count;
             int totalUnsupportedComponents = ListUnsupportedComponentsForBom.Components.Count;
-            GetDistinctComponentList(ref listofComponents);            
+            listComponentForBOM = listComponentForBOM.Distinct(new ComponentEqualityComparer()).ToList();
             BomCreator.bomKpiData.ComponentsinPackageLockJsonFile += ListUnsupportedComponentsForBom.Components.Count;
             ListUnsupportedComponentsForBom.Components = ListUnsupportedComponentsForBom.Components.Distinct(new ComponentEqualityComparer()).ToList();
             BomCreator.bomKpiData.DuplicateComponents = initialCount - listComponentForBOM.Count;