fixed tests data structure

jfrog · Dec 11, 2024 · 48d1dbe · 48d1dbe
1 parent 65af5fa
commit 48d1dbe
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 47 deletions.
diff --git a/packagehandlers/conanpackagehandler.go b/packagehandlers/conanpackagehandler.go
@@ -33,7 +33,7 @@ func (conan *ConanPackageHandler) UpdateDependency(vulnDetails *utils.Vulnerabil
 func (conan *ConanPackageHandler) updateDirectDependency(vulnDetails *utils.VulnerabilityDetails) (err error) {
 	conanDescriptors, err := conan.CommonPackageHandler.GetAllDescriptorFilesFullPaths([]string{conanFileTxt, conanFilePy})
 	if err != nil {
-		err = fmt.Errorf("failed while serching for conanfile in project: %s", err.Error())
+		err = fmt.Errorf("failed while searching for Conan descriptor files in project: %s", err.Error())
 		return
 	}
 	isAnyDescriptorFileChanged := false

diff --git a/packagehandlers/packagehandlers_test.go b/packagehandlers/packagehandlers_test.go
@@ -355,7 +355,7 @@ func TestUpdateDependency(t *testing.T) {
 				},
 				scanDetails:        scanDetails,
 				fixSupported:       true,
-				testDirName:        filepath.Join("conan", "conan_txt"),
+				testDirName:        filepath.Join("conan"),
 				descriptorsToCheck: []string{"conanfile.txt"},
 			},
 			{
@@ -366,7 +366,7 @@ func TestUpdateDependency(t *testing.T) {
 				},
 				scanDetails:        scanDetails,
 				fixSupported:       true,
-				testDirName:        filepath.Join("conan", "conan_py"),
+				testDirName:        filepath.Join("conan"),
 				descriptorsToCheck: []string{"conanfile.py"},
 			},
 			{
@@ -377,7 +377,7 @@ func TestUpdateDependency(t *testing.T) {
 				},
 				scanDetails:        scanDetails,
 				fixSupported:       true,
-				testDirName:        filepath.Join("conan", "conan_py_txt"),
+				testDirName:        filepath.Join("conan"),
 				descriptorsToCheck: []string{"conanfile.py", "conanfile.txt"},
 			},
 		},

diff --git a/testdata/projects/conan/conan_py_txt/conanfile.py b/testdata/projects/conan/conan_py_txt/conanfile.py
diff --git a/testdata/projects/conan/conan_py_txt/profile b/testdata/projects/conan/conan_py_txt/profile
diff --git a/testdata/projects/conan/conan_txt/conanfile.txt b/testdata/projects/conan/conan_txt/conanfile.txt
diff --git a/testdata/projects/conan/conan_txt/profile b/testdata/projects/conan/conan_txt/profile
diff --git a/...data/projects/conan/conan_py/conanfile.py → testdata/projects/conan/conanfile.py b/...data/projects/conan/conan_py/conanfile.py → testdata/projects/conan/conanfile.py
diff --git a/...projects/conan/conan_py_txt/conanfile.txt → testdata/projects/conan/conanfile.txt b/...projects/conan/conan_py_txt/conanfile.txt → testdata/projects/conan/conanfile.txt
diff --git a/testdata/projects/conan/conan_py/profile → testdata/projects/conan/profile b/testdata/projects/conan/conan_py/profile → testdata/projects/conan/profile