neuron-technologies/gitea
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tests/integration: simplify code (#37249)

Browse Source 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Claude (Opus 4.7) <noreply@anthropic.com>
This commit is contained in:
Copilot
2026-04-17 20:33:49 +08:00
committed by GitHub
parent dc974715e9
commit eb334e3738
23 changed files with 168 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/api_packages_conan_test.go
+10 -13
View File
@@ -158,6 +158,10 @@ func uploadConanPackageV1(t *testing.T, baseURL, token, name, version, user, cha
}
func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, channel, recipeRevision, packageRevision string) {
type fileList struct {
Files map[string]any `json:"files"`
}
contentConanfile := buildConanfileContent(name, version)
recipeURL := fmt.Sprintf("%s/v2/conans/%s/%s/%s/%s/revisions/%s", baseURL, name, version, user, channel, recipeRevision)
@@ -170,10 +174,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
AddTokenAuth(token)
resp := MakeRequest(t, req, http.StatusOK)
var list *struct {
Files map[string]any `json:"files"`
}
DecodeJSON(t, resp, &list)
list := DecodeJSON(t, resp, &fileList{})
assert.Len(t, list.Files, 1)
assert.Contains(t, list.Files, conanfileName)
@@ -191,8 +192,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
AddTokenAuth(token)
resp = MakeRequest(t, req, http.StatusOK)
list = nil
DecodeJSON(t, resp, &list)
list = DecodeJSON(t, resp, &fileList{})
assert.Len(t, list.Files, 1)
assert.Contains(t, list.Files, conaninfoName)
}
@@ -458,8 +458,7 @@ func TestPackageConan(t *testing.T) {
req := NewRequest(t, "GET", fmt.Sprintf("%s/v1/conans/search?q=%s", url, stdurl.QueryEscape(c.Query)))
resp := MakeRequest(t, req, http.StatusOK)
var result *conan_router.SearchResult
DecodeJSON(t, resp, &result)
result := DecodeJSON(t, resp, &conan_router.SearchResult{})
assert.ElementsMatch(t, c.Expected, result.Results, "case %d: unexpected result", i)
}
@@ -702,8 +701,7 @@ func TestPackageConan(t *testing.T) {
Revisions []*RevisionInfo `json:"revisions"`
}
var list *RevisionList
DecodeJSON(t, resp, &list)
list := DecodeJSON(t, resp, &RevisionList{})
assert.Len(t, list.Revisions, 2)
revs := make([]string, 0, len(list.Revisions))
for _, rev := range list.Revisions {
@@ -714,7 +712,7 @@ func TestPackageConan(t *testing.T) {
req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/packages/%s/revisions", recipeURL, revision1, conanPackageReference))
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &list)
list = DecodeJSON(t, resp, &RevisionList{})
assert.Len(t, list.Revisions, 2)
revs = make([]string, 0, len(list.Revisions))
for _, rev := range list.Revisions {
@@ -754,8 +752,7 @@ func TestPackageConan(t *testing.T) {
req := NewRequest(t, "GET", fmt.Sprintf("%s/v2/conans/search?q=%s", url, stdurl.QueryEscape(c.Query)))
resp := MakeRequest(t, req, http.StatusOK)
var result *conan_router.SearchResult
DecodeJSON(t, resp, &result)
result := DecodeJSON(t, resp, &conan_router.SearchResult{})
assert.ElementsMatch(t, c.Expected, result.Results, "case %d: unexpected result", i)
}