Merge branch 'feature/ChocoPackages_Discovery' into feature/Artifactoryuploadercleanup

Author: MalavikaKrishnan100

src/LCT.PackageIdentifier.UTest/CommonIdentiferHelperTests.cs

@@ -66,38 +66,7 @@ public void GetRepodetailsFromPerticularOrder_NoSpecificRepo_ReturnsFirstRepo()
             };
             var result = CommonIdentiferHelper.GetRepodetailsFromPerticularOrder(aqlResults);
             Assert.AreEqual("generic-repo", result);
-        }
-        [Test]
-        public void GetBomFileName_WhenBasicSBOMIsFalse_ReturnsProjectNameBomFileName()
-        {
-            // Arrange
-            var appSettings = new CommonAppSettings
-            {
-                SW360 = new SW360() { ProjectName = "TestProject" }
-            };
-
-            // Act
-            string result = CommonIdentiferHelper.GetBomFileName(appSettings);
-
-            // Assert
-            Assert.AreEqual("TestProject_Bom.cdx.json", result);
-        }
-
-        [Test]
-        public void GetBomFileName_WhenBasicSBOMIsTrue_ReturnsBasicSBOMNameBomFileName()
-        {
-            // Arrange
-            var appSettings = new CommonAppSettings
-            {
-
-            };
-
-            // Act
-            string result = CommonIdentiferHelper.GetBomFileName(appSettings);
-
-            // Assert
-            Assert.AreEqual(FileConstant.basicSBOMName + "_Bom.cdx.json", result);
-        }
+        }           
 
         [Test]
         public void GetDefaultProjectName_WhenBasicSBOMIsFalse_ReturnsProjectName()

src/LCT.PackageIdentifier/BomCreator.cs

@@ -136,8 +136,7 @@ private static void WritecontentsToBOM(CommonAppSettings appSettings, BomKpiData
         private static void WriteContentToCycloneDxBOM(CommonAppSettings appSettings, Bom listOfComponentsToBom, ref BomKpiData bomKpiData, string defaultProjectName)
         {
             FileOperations fileOperations = new FileOperations();
-            string bomFileName = CommonIdentiferHelper.GetBomFileName(appSettings);
-
+            string bomFileName = $"{defaultProjectName}_{FileConstant.BomFileName}";
             string outputFolderPath = appSettings.Directory.OutputFolder;
             string[] files = Directory.GetFiles(outputFolderPath);
 

src/LCT.PackageIdentifier/CommonIdentiferHelper.cs

@@ -52,21 +52,7 @@ private static string FindRepositoryByKeywords(List<AqlResult> aqlResults, strin
                 }
             }
             return null;
-        }
-        public static string GetBomFileName(CommonAppSettings appSettings)
-        {
-            string bomFileName;
-            if (appSettings.SW360 != null)
-            {
-                bomFileName = $"{appSettings.SW360.ProjectName}_Bom.cdx.json";
-            }
-            else
-            {
-                bomFileName = FileConstant.basicSBOMName + "_Bom.cdx.json";
-            }
-
-            return bomFileName;
-        }
+        }        
         public static string GetDefaultProjectName(CommonAppSettings appSettings)
         {
             string projectName;