Refactor file path construction for robustness

Aditya Narayan · Aditya Narayan · commit 11881cebd775 · 2025-03-21T18:58:26.000+05:30
Updated file path construction to use `Path.GetFullPath` and `Path.Combine` instead of string concatenation. This change affects the `Setup` and test methods in `ComponentCreatorInitialAlpine.cs`, `PackageIdentifierBasicSBOMAlpine.cs`, and `PackageIdentifierInitialAlpine.cs`. These updates enhance code maintainability and cross-platform compatibility.
diff --git a/src/SW360IntegrationTest/Alpine/ComponentCreatorInitialAlpine.cs b/src/SW360IntegrationTest/Alpine/ComponentCreatorInitialAlpine.cs
@@ -29,13 +29,13 @@ public void Setup()
         {
             testParameters = new TestParamAlpine();
             OutFolder = TestHelper.OutFolder;
-            CCTComparisonBomTestFile = OutFolder + @"..\..\..\src\SW360IntegrationTest\PackageCreatorTestFiles\Alpine\CCTComparisonBOMAlpineInitial.json";
+            CCTComparisonBomTestFile = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "..", "src", "SW360IntegrationTest", "PackageCreatorTestFiles", "Alpine", "CCTComparisonBOMAlpineInitial.json"));
 
             if (!TestHelper.BOMCreated)
             {
                 OutFolder = TestHelper.OutFolder;
-                string packagejsonPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\SystemTest1stIterationData\Alpine";
-                string bomPath = OutFolder + @"\..\BOMs";
+                string packagejsonPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "TestFiles", "IntegrationTestFiles", "SystemTest1stIterationData", "Alpine"));
+                string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));
                 TestHelper.RunBOMCreatorExe(new string[]{
                 TestConstant.PackageFilePath, packagejsonPath,
                 TestConstant.BomFolderPath, bomPath,
@@ -55,7 +55,7 @@ public void Setup()
         [Test, Order(1)]
         public void ComponentCreatorExe_ProvidedBOMFilePath_ReturnsSuccess()
         {
-            string bomPath = OutFolder + $"\\..\\BOMs";
+            string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));
             // Assert
             // Check exit is normal
             Assert.AreEqual(0, TestHelper.RunComponentCreatorExe(new string[] {
@@ -82,7 +82,7 @@ public void TestComparisionBOMUpdation()
             expected.Read(CCTComparisonBomTestFile);
 
             // Actual
-            string generatedBOM = OutFolder + $"\\..\\BOMs\\{testParameters.SW360ProjectName}_Bom.cdx.json";
+            string generatedBOM = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs", $"{testParameters.SW360ProjectName}_Bom.cdx.json"));
             if (File.Exists(generatedBOM))
             {
 
diff --git a/src/SW360IntegrationTest/Alpine/PackageIdentifierBasicSBOMAlpine.cs b/src/SW360IntegrationTest/Alpine/PackageIdentifierBasicSBOMAlpine.cs
@@ -17,20 +17,20 @@ public void Setup()
         {
             OutFolder = TestHelper.OutFolder;
 
-            CCTLocalBomTestFile = OutFolder + @"..\..\..\src\SW360IntegrationTest\PackageIdentifierTestFiles\Alpine\CCTLocalBOMAlpineInitial.json";
+            CCTLocalBomTestFile = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "..", "src", "SW360IntegrationTest", "PackageIdentifierTestFiles", "Alpine", "CCTLocalBOMAlpineInitial.json"));
 
-            if (!Directory.Exists(OutFolder + @"\..\BOMs"))
+            if (!Directory.Exists(Path.Combine(OutFolder, "..", "BOMs")))
             {
-                Directory.CreateDirectory(OutFolder + @"\..\BOMs");
+                Directory.CreateDirectory(Path.Combine(OutFolder, "..", "BOMs"));
             }
             testParameters = new TestParamAlpine();
         }
 
         [Test, Order(1)]
         public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
         {
-            string packagejsonPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\SystemTest1stIterationData\Alpine";
-            string bomPath = OutFolder + @"\..\BOMs";
+            string packagejsonPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "TestFiles", "IntegrationTestFiles", "SystemTest1stIterationData", "Alpine"));
+            string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));
             string appsettingsFilePath = @"BasicSBOMAppsettingsTest.json";
 
             // Test BOM Creator ran with exit code 0
@@ -53,7 +53,7 @@ public void LocalBOMCreation_AfterSuccessfulExeRun_ReturnsSuccess()
             expected.Read(CCTLocalBomTestFile);
 
             // Actual
-            string generatedBOM = OutFolder + $"\\..\\BOMs\\ContinuousClearing_Bom.cdx.json";
+            string generatedBOM = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs", "ContinuousClearing_Bom.cdx.json"));
             if (File.Exists(generatedBOM))
             {
                 fileExist = true;
diff --git a/src/SW360IntegrationTest/Alpine/PackageIdentifierInitialAlpine.cs b/src/SW360IntegrationTest/Alpine/PackageIdentifierInitialAlpine.cs
@@ -26,20 +26,21 @@ public void Setup()
         {
             OutFolder = TestHelper.OutFolder;
 
-            CCTLocalBomTestFile = OutFolder + @"..\..\..\src\SW360IntegrationTest\PackageIdentifierTestFiles\Alpine\CCTLocalBOMAlpineInitial.json";
+            CCTLocalBomTestFile = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "..", "src", "SW360IntegrationTest", "PackageIdentifierTestFiles", "Alpine", "CCTLocalBOMAlpineInitial.json"));
 
-            if (!Directory.Exists(OutFolder + @"\..\BOMs"))
+            if (!Directory.Exists(Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"))))
             {
-                Directory.CreateDirectory(OutFolder + @"\..\BOMs");
+                Directory.CreateDirectory(Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs")));
             }
             testParameters = new TestParamAlpine();
         }
 
         [Test, Order(1)]
         public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()
         {
-            string packagejsonPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\SystemTest1stIterationData\Alpine";
-            string bomPath = OutFolder + @"\..\BOMs";
+            string packagejsonPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "TestFiles", "IntegrationTestFiles", "SystemTest1stIterationData", "Alpine"));
+            string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));
+
 
             // Test BOM Creator ran with exit code 0
             Assert.AreEqual(0, TestHelper.RunBOMCreatorExe(new string[]{
@@ -70,7 +71,7 @@ public void LocalBOMCreation_AfterSuccessfulExeRun_ReturnsSuccess()
             expected.Read(CCTLocalBomTestFile);
 
             // Actual
-            string generatedBOM = OutFolder + $"\\..\\BOMs\\{testParameters.SW360ProjectName}_Bom.cdx.json";
+            string generatedBOM = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs", $"{testParameters.SW360ProjectName}_Bom.cdx.json"));
             if (File.Exists(generatedBOM))
             {
                 fileExist = true;

Original file line number	Diff line number	Diff line change
`@@ -17,20 +17,20 @@ public void Setup()`
`17`	`17`	`{`
`18`	`18`	`OutFolder = TestHelper.OutFolder;`
`19`	`19`
`20`		`- CCTLocalBomTestFile = OutFolder + @"..\..\..\src\SW360IntegrationTest\PackageIdentifierTestFiles\Alpine\CCTLocalBOMAlpineInitial.json";`
	`20`	`+ CCTLocalBomTestFile = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "..", "src", "SW360IntegrationTest", "PackageIdentifierTestFiles", "Alpine", "CCTLocalBOMAlpineInitial.json"));`
`21`	`21`
`22`		`- if (!Directory.Exists(OutFolder + @"\..\BOMs"))`
	`22`	`+ if (!Directory.Exists(Path.Combine(OutFolder, "..", "BOMs")))`
`23`	`23`	`{`
`24`		`- Directory.CreateDirectory(OutFolder + @"\..\BOMs");`
	`24`	`+ Directory.CreateDirectory(Path.Combine(OutFolder, "..", "BOMs"));`
`25`	`25`	`}`
`26`	`26`	`testParameters = new TestParamAlpine();`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[Test, Order(1)]`
`30`	`30`	`public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()`
`31`	`31`	`{`
`32`		`- string packagejsonPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\SystemTest1stIterationData\Alpine";`
`33`		`- string bomPath = OutFolder + @"\..\BOMs";`
	`32`	`+ string packagejsonPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "TestFiles", "IntegrationTestFiles", "SystemTest1stIterationData", "Alpine"));`
	`33`	`+ string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));`
`34`	`34`	`string appsettingsFilePath = @"BasicSBOMAppsettingsTest.json";`
`35`	`35`
`36`	`36`	`// Test BOM Creator ran with exit code 0`
`@@ -53,7 +53,7 @@ public void LocalBOMCreation_AfterSuccessfulExeRun_ReturnsSuccess()`
`53`	`53`	`expected.Read(CCTLocalBomTestFile);`
`54`	`54`
`55`	`55`	`// Actual`
`56`		`- string generatedBOM = OutFolder + $"\\..\\BOMs\\ContinuousClearing_Bom.cdx.json";`
	`56`	`+ string generatedBOM = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs", "ContinuousClearing_Bom.cdx.json"));`
`57`	`57`	`if (File.Exists(generatedBOM))`
`58`	`58`	`{`
`59`	`59`	`fileExist = true;`
Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,21 @@ public void Setup()`
`26`	`26`	`{`
`27`	`27`	`OutFolder = TestHelper.OutFolder;`
`28`	`28`
`29`		`- CCTLocalBomTestFile = OutFolder + @"..\..\..\src\SW360IntegrationTest\PackageIdentifierTestFiles\Alpine\CCTLocalBOMAlpineInitial.json";`
	`29`	`+ CCTLocalBomTestFile = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "..", "src", "SW360IntegrationTest", "PackageIdentifierTestFiles", "Alpine", "CCTLocalBOMAlpineInitial.json"));`
`30`	`30`
`31`		`- if (!Directory.Exists(OutFolder + @"\..\BOMs"))`
	`31`	`+ if (!Directory.Exists(Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"))))`
`32`	`32`	`{`
`33`		`- Directory.CreateDirectory(OutFolder + @"\..\BOMs");`
	`33`	`+ Directory.CreateDirectory(Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs")));`
`34`	`34`	`}`
`35`	`35`	`testParameters = new TestParamAlpine();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[Test, Order(1)]`
`39`	`39`	`public void RunBOMCreatorexe_ProvidedPackageJsonFilePath_ReturnsSuccess()`
`40`	`40`	`{`
`41`		`- string packagejsonPath = OutFolder + @"\..\..\TestFiles\IntegrationTestFiles\SystemTest1stIterationData\Alpine";`
`42`		`- string bomPath = OutFolder + @"\..\BOMs";`
	`41`	`+ string packagejsonPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "..", "TestFiles", "IntegrationTestFiles", "SystemTest1stIterationData", "Alpine"));`
	`42`	`+ string bomPath = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs"));`
	`43`	`+`
`43`	`44`
`44`	`45`	`// Test BOM Creator ran with exit code 0`
`45`	`46`	`Assert.AreEqual(0, TestHelper.RunBOMCreatorExe(new string[]{`
`@@ -70,7 +71,7 @@ public void LocalBOMCreation_AfterSuccessfulExeRun_ReturnsSuccess()`
`70`	`71`	`expected.Read(CCTLocalBomTestFile);`
`71`	`72`
`72`	`73`	`// Actual`
`73`		`- string generatedBOM = OutFolder + $"\\..\\BOMs\\{testParameters.SW360ProjectName}_Bom.cdx.json";`
	`74`	`+ string generatedBOM = Path.GetFullPath(Path.Combine(OutFolder, "..", "BOMs", $"{testParameters.SW360ProjectName}_Bom.cdx.json"));`
`74`	`75`	`if (File.Exists(generatedBOM))`
`75`	`76`	`{`
`76`	`77`	`fileExist = true;`