Skip to content

Commit 795b3f5

Browse files
committed
add test
1 parent 7fe5a36 commit 795b3f5

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

routers/api/packages/maven/api.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"strings"
99

1010
packages_model "code.gitea.io/gitea/models/packages"
11-
maven_module "code.gitea.io/gitea/modules/packages/maven"
1211
)
1312

1413
// MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html
@@ -22,7 +21,7 @@ type MetadataResponse struct {
2221
}
2322

2423
// pds is expected to be sorted ascending by CreatedUnix
25-
func createMetadataResponse(pds []*packages_model.PackageDescriptor) *MetadataResponse {
24+
func createMetadataResponse(pds []*packages_model.PackageDescriptor, groupID, artifactID string) *MetadataResponse {
2625
var release *packages_model.PackageDescriptor
2726

2827
versions := make([]string, 0, len(pds))
@@ -35,11 +34,9 @@ func createMetadataResponse(pds []*packages_model.PackageDescriptor) *MetadataRe
3534

3635
latest := pds[len(pds)-1]
3736

38-
metadata := latest.Metadata.(*maven_module.Metadata)
39-
4037
resp := &MetadataResponse{
41-
GroupID: metadata.GroupID,
42-
ArtifactID: metadata.ArtifactID,
38+
GroupID: groupID,
39+
ArtifactID: artifactID,
4340
Latest: latest.Version.Version,
4441
Version: versions,
4542
}

routers/api/packages/maven/maven.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func serveMavenMetadata(ctx *context.Context, params parameters) {
109109
return pds[i].Version.CreatedUnix < pds[j].Version.CreatedUnix
110110
})
111111

112-
xmlMetadata, err := xml.Marshal(createMetadataResponse(pds))
112+
xmlMetadata, err := xml.Marshal(createMetadataResponse(pds, params.GroupID, params.ArtifactID))
113113
if err != nil {
114114
apiError(ctx, http.StatusInternalServerError, err)
115115
return

tests/integration/api_packages_maven_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func TestPackageMaven(t *testing.T) {
8080
t.Run("UploadLegacy", func(t *testing.T) {
8181
defer tests.PrintCurrentTest(t)()
8282

83+
// try to upload a package with legacy package name (will be saved as "GroupID-ArtifactID")
8384
legacyRootLink := "/api/packages/user2/maven/com/gitea/legacy-project"
8485
req := NewRequestWithBody(t, "PUT", legacyRootLink+"/1.0.2/any-file-name?use_legacy_package_name=1", strings.NewReader("test-content")).AddBasicAuth(user.Name)
8586
MakeRequest(t, req, http.StatusCreated)
@@ -97,6 +98,13 @@ func TestPackageMaven(t *testing.T) {
9798
req = NewRequest(t, "GET", "/user2/-/packages/maven/com.gitea%3Alegacy-project/1.0.2")
9899
MakeRequest(t, req, http.StatusNotFound)
99100

101+
// legacy package names should also be able to be listed
102+
req = NewRequest(t, "GET", legacyRootLink+"/maven-metadata.xml").AddBasicAuth(user.Name)
103+
resp := MakeRequest(t, req, http.StatusOK)
104+
respBody := resp.Body.String()
105+
assert.Contains(t, respBody, "<version>1.0.2</version>")
106+
107+
// then upload a package with correct package name (will be saved as "GroupID:ArtifactID")
100108
req = NewRequestWithBody(t, "PUT", legacyRootLink+"/1.0.3/any-file-name", strings.NewReader("test-content")).AddBasicAuth(user.Name)
101109
MakeRequest(t, req, http.StatusCreated)
102110
_, err = packages.GetPackageByName(db.DefaultContext, user.ID, packages.TypeMaven, "com.gitea-legacy-project")
@@ -114,6 +122,12 @@ func TestPackageMaven(t *testing.T) {
114122
req = NewRequest(t, "GET", "/user2/-/packages/maven/com.gitea%3Alegacy-project/1.0.2")
115123
MakeRequest(t, req, http.StatusOK)
116124

125+
// now 2 packages should be listed
126+
req = NewRequest(t, "GET", legacyRootLink+"/maven-metadata.xml").AddBasicAuth(user.Name)
127+
resp = MakeRequest(t, req, http.StatusOK)
128+
respBody = resp.Body.String()
129+
assert.Contains(t, respBody, "<version>1.0.2</version>")
130+
assert.Contains(t, respBody, "<version>1.0.3</version>")
117131
require.NoError(t, packages.DeletePackageByID(db.DefaultContext, p.ID))
118132
})
119133

0 commit comments

Comments
 (0)