-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
- Loading branch information
Showing
6 changed files
with
187 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Enhancement: Cover ocdav with more unit tests | ||
|
|
||
| We added unit tests to cover more ocdav handlers: | ||
| - delete | ||
|
|
||
| https://github.com/cs3org/reva/pull/3441 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
internal/http/services/owncloud/ocdav/ocdav_blackbox_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // Copyright 2021 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
| package ocdav_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "strings" | ||
|
|
||
| cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" | ||
| cs3storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" | ||
| typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" | ||
| "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav" | ||
| "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" | ||
| "github.com/cs3org/reva/v2/pkg/rgrpc/status" | ||
| "github.com/cs3org/reva/v2/pkg/rhttp/global" | ||
| "github.com/cs3org/reva/v2/pkg/storagespace" | ||
| "github.com/cs3org/reva/v2/pkg/utils" | ||
| "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" | ||
| "github.com/stretchr/testify/mock" | ||
| "go.opentelemetry.io/otel/trace" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| // TODO for now we have to test all of ocdav. when this testsuite is complete we can move | ||
| // the handlers to dedicated packages to reduce the amount of complexity to get a test environment up | ||
| var _ = Describe("ocdav", func() { | ||
| var ( | ||
| handler global.Service | ||
| client *mocks.GatewayAPIClient | ||
| ctx context.Context | ||
|
|
||
| foospace *cs3storageprovider.StorageSpace | ||
| ) | ||
|
|
||
| JustBeforeEach(func() { | ||
| ctx = context.WithValue(context.Background(), net.CtxKeyBaseURI, "http://127.0.0.1:3000") | ||
| client = &mocks.GatewayAPIClient{} | ||
|
|
||
| var err error | ||
| handler, err = ocdav.NewWith(&ocdav.Config{}, nil, ocdav.NewCS3LS(client), nil, trace.NewNoopTracerProvider(), client) | ||
| Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| foospace = &cs3storageprovider.StorageSpace{ | ||
| Opaque: &typesv1beta1.Opaque{ | ||
| Map: map[string]*typesv1beta1.OpaqueEntry{ | ||
| "path": { | ||
| Decoder: "plain", | ||
| Value: []byte("/foospace/"), | ||
| }, | ||
| }, | ||
| }, | ||
| Id: &cs3storageprovider.StorageSpaceId{OpaqueId: storagespace.FormatResourceID(cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"})}, | ||
| Root: &cs3storageprovider.ResourceId{StorageId: "provider-1", SpaceId: "foospace", OpaqueId: "root"}, | ||
| Name: "foospace", | ||
| } | ||
|
|
||
| client.On("GetUser", mock.Anything, mock.Anything).Return(&cs3user.GetUserResponse{ | ||
| Status: status.NewNotFound(ctx, "not found"), | ||
| }, nil) | ||
| client.On("GetUserByClaim", mock.Anything, mock.Anything).Return(&cs3user.GetUserByClaimResponse{ | ||
| Status: status.NewNotFound(ctx, "not found"), | ||
| }, nil) | ||
| }) | ||
|
|
||
| Describe("NewHandler", func() { | ||
| It("returns a handler", func() { | ||
| Expect(handler).ToNot(BeNil()) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("HandlePathDelete", func() { | ||
| It("deletes the given path", func() { | ||
| client.On("ListStorageSpaces", mock.Anything, mock.MatchedBy(func(req *cs3storageprovider.ListStorageSpacesRequest) bool { | ||
| p := string(req.Opaque.Map["path"].Value) | ||
| return p == "/" || strings.HasPrefix(p, "/foospace") | ||
| })).Return(&cs3storageprovider.ListStorageSpacesResponse{ | ||
| Status: status.NewOK(ctx), | ||
| StorageSpaces: []*cs3storageprovider.StorageSpace{foospace}, | ||
| }, nil) | ||
|
|
||
| ref := cs3storageprovider.Reference{ | ||
| ResourceId: foospace.Root, | ||
| Path: "./foo", | ||
| } | ||
|
|
||
| client.On("Delete", mock.Anything, mock.MatchedBy(func(req *cs3storageprovider.DeleteRequest) bool { | ||
| return utils.ResourceEqual(req.Ref, &ref) | ||
| })).Return(&cs3storageprovider.DeleteResponse{ | ||
| Status: status.NewOK(ctx), | ||
| }, nil) | ||
|
|
||
| rr := httptest.NewRecorder() | ||
| req, err := http.NewRequest("DELETE", "/dav/files/username/foospace/foo", strings.NewReader("")) | ||
| Expect(err).ToNot(HaveOccurred()) | ||
| req = req.WithContext(ctx) | ||
|
|
||
| handler.Handler().ServeHTTP(rr, req) | ||
| Expect(rr).To(HaveHTTPStatus(http.StatusNoContent), "WebDAV DELETE must return 204") | ||
| Expect(rr).To(HaveHTTPBody(""), "Body must be empty") | ||
| }) | ||
| }) | ||
|
|
||
| Describe("HandleSpacesDelete", func() { | ||
| It("deletes the given path", func() { | ||
| client.On("ListStorageSpaces", mock.Anything, mock.MatchedBy(func(req *cs3storageprovider.ListStorageSpacesRequest) bool { | ||
| p := string(req.Opaque.Map["path"].Value) | ||
| return p == "/" || strings.HasPrefix(p, "/foospace") | ||
| })).Return(&cs3storageprovider.ListStorageSpacesResponse{ | ||
| Status: status.NewOK(ctx), | ||
| StorageSpaces: []*cs3storageprovider.StorageSpace{foospace}, | ||
| }, nil) | ||
|
|
||
| ref := cs3storageprovider.Reference{ | ||
| ResourceId: foospace.Root, | ||
| Path: "./foo", | ||
| } | ||
|
|
||
| client.On("Delete", mock.Anything, mock.MatchedBy(func(req *cs3storageprovider.DeleteRequest) bool { | ||
| return utils.ResourceEqual(req.Ref, &ref) | ||
| })).Return(&cs3storageprovider.DeleteResponse{ | ||
| Status: status.NewOK(ctx), | ||
| }, nil) | ||
|
|
||
| rr := httptest.NewRecorder() | ||
| req, err := http.NewRequest("DELETE", "/dav/spaces/provider-1$foospace!root/foo", strings.NewReader("")) | ||
| Expect(err).ToNot(HaveOccurred()) | ||
| req = req.WithContext(ctx) | ||
|
|
||
| handler.Handler().ServeHTTP(rr, req) | ||
| Expect(rr).To(HaveHTTPStatus(http.StatusNoContent), "WebDAV DELETE must return 204") | ||
| Expect(rr).To(HaveHTTPBody(""), "Body must be empty") | ||
| }) | ||
|
|
||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters