Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion capycli/common/script_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ def find_project(self, name: str, version: str, show_results: bool = False) -> s
+ " => ID = "
+ pid
)
if project["version"].lower() == version.lower():
if (project["name"].lower() == name.lower()
and project["version"].lower() == version.lower()):
return pid

return ""
Expand Down
49 changes: 49 additions & 0 deletions tests/test_script_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,55 @@ def test_find_project_success(self) -> None:
val = sut.find_project("MyName", "MyVersion", True)
self.assertEqual("007", val)

@responses.activate
def test_find_project_success_multiple_results_same_version(self) -> None:
sut = ScriptBase()

self.add_login_response()

login = sut.login(token=TestBase.MYTOKEN, url=TestBase.MYURL)
self.assertTrue(login)

responses.add(
responses.GET,
url=self.MYURL + "resource/api/projects?name=MyName",
json={
"_embedded": {
"sw360:projects": [{
"name": "OtherMyName",
"version": "MyVersion",
"securityResponsibles": [],
"considerReleasesFromExternalList": False,
"projectType": "PRODUCT",
"visibility": "EVERYONE",
"_links": {
"self": {
"href": TestBase.MYURL + "resource/api/projects/007"
}
}
}, {
"name": "MyName",
"version": "MyVersion",
"securityResponsibles": [],
"considerReleasesFromExternalList": False,
"projectType": "PRODUCT",
"visibility": "EVERYONE",
"_links": {
"self": {
"href": TestBase.MYURL + "resource/api/projects/008"
}
}
}]
}
},
status=200,
content_type="application/json",
adding_headers={"Authorization": "Token " + self.MYTOKEN},
)

val = sut.find_project("MyName", "MyVersion", True)
self.assertEqual("008", val)

@responses.activate
def test_find_project_fail_sw360_error(self) -> None:
sut = ScriptBase()
Expand Down
Loading