@@ -5,7 +5,6 @@ package integration
55
66import (
77 "bytes"
8- "encoding/json"
98 "fmt"
109 "io"
1110 "net/http"
@@ -14,6 +13,7 @@ import (
1413 "code.gitea.io/gitea/models/packages"
1514 "code.gitea.io/gitea/models/unittest"
1615 user_model "code.gitea.io/gitea/models/user"
16+ "code.gitea.io/gitea/modules/json"
1717 "code.gitea.io/gitea/modules/setting"
1818 "code.gitea.io/gitea/modules/test"
1919 "code.gitea.io/gitea/modules/timeutil"
@@ -35,7 +35,7 @@ func TestPackageGeneric(t *testing.T) {
3535
3636 timestamp := timeutil .TimeStampNow ().AsTime ().Unix ()
3737 url := fmt .Sprintf ("/api/packages/%s/generic/%s/%s" , user .Name , packageName , packageVersion )
38- listUrl := fmt .Sprintf ("/api/packages/%s/generic/%s/list" , user .Name , packageName )
38+ listURL := fmt .Sprintf ("/api/packages/%s/generic/%s/list" , user .Name , packageName )
3939
4040 t .Run ("Upload" , func (t * testing.T ) {
4141 defer tests .PrintCurrentTest (t )()
@@ -106,27 +106,27 @@ func TestPackageGeneric(t *testing.T) {
106106 t .Run ("List" , func (t * testing.T ) {
107107 defer tests .PrintCurrentTest (t )()
108108
109- req := NewRequest (t , "GET" , listUrl )
109+ req := NewRequest (t , "GET" , listURL )
110110 resp := MakeRequest (t , req , http .StatusOK )
111111
112112 var expected []generic.PackageInfo
113113 err := json .Unmarshal (resp .Body .Bytes (), & expected )
114114 assert .NoError (t , err )
115115
116- assert .Equal (t , len ( expected ) , 1 )
117- assert .Equal (t , len ( expected [0 ].Files ) , 2 )
116+ assert .Len (t , expected , 1 )
117+ assert .Len (t , expected [0 ].Files , 2 )
118118
119119 resPkg := expected [0 ]
120- assert .Equal (t , resPkg .Version , packageVersion )
121- assert .Equal (t , resPkg . DownloadCount , int64 (0 ))
120+ assert .Equal (t , packageVersion , resPkg .Version )
121+ assert .Equal (t , int64 (0 ), resPkg . DownloadCount )
122122
123123 resFile1 := expected [0 ].Files [0 ]
124- assert .Equal (t , resFile1 .Name , filename )
125- assert .GreaterOrEqual (t , resFile1 .CreatedUnix , timestamp )
124+ assert .Equal (t , filename , resFile1 .Name )
125+ assert .LessOrEqual (t , timestamp , resFile1 .CreatedUnix )
126126
127127 resFile2 := expected [0 ].Files [1 ]
128- assert .Equal (t , resFile2 . Name , "dummy.bin" )
129- assert .GreaterOrEqual (t , resFile2 .CreatedUnix , timestamp )
128+ assert .Equal (t , "dummy.bin" , resFile2 . Name )
129+ assert .LessOrEqual (t , timestamp , resFile2 .CreatedUnix )
130130 })
131131
132132 t .Run ("Download" , func (t * testing.T ) {
0 commit comments