mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2024-08-06 13:33:18 +02:00
parent 4c6551501e
commit 4511f875d2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/proxy/pkg/proxy/proxy_integration_test.go
View File

@@ -10,8 +10,10 @@ import (
"testing"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/router"
"go-micro.dev/v4/selector"
)
func TestProxyIntegration(t *testing.T) {
@@ -111,12 +113,15 @@ func TestProxyIntegration(t *testing.T) {
expectProxyTo("http://users.example.com/user/1234"),
}
reg := registry.GetRegistry()
sel := selector.NewSelector(selector.Registry(reg))
for k := range tests {
t.Run(tests[k].id, func(t *testing.T) {
t.Parallel()
tc := tests[k]
rt := router.Middleware(nil, tc.conf, log.NewLogger())
rt := router.Middleware(sel, nil, tc.conf, log.NewLogger())
rp := newTestProxy(testConfig(tc.conf), func(req *http.Request) *http.Response {
if got, want := req.URL.String(), tc.expect.String(); got != want {
t.Errorf("Proxied url should be %v got %v", want, got)

12
services/proxy/pkg/router/router_test.go
View File

@@ -10,8 +10,10 @@ import (
"testing"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config"
"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
"go-micro.dev/v4/selector"
)
type matchertest struct {
@@ -69,7 +71,9 @@ func TestQueryRouteMatcher(t *testing.T) {
func TestRegexRouteMatcher(t *testing.T) {
cfg := defaults.DefaultConfig()
cfg.Policies = defaults.DefaultPolicies()
rt := New(cfg.PolicySelector, cfg.Policies, log.NewLogger())
reg := registry.GetRegistry()
sel := selector.NewSelector(selector.Registry(reg))
rt := New(sel, cfg.PolicySelector, cfg.Policies, log.NewLogger())
table := []matchertest{
{endpoint: ".*some\\/url.*parameter=true", target: "/foobar/baz/some/url?parameter=true", matches: true},
@@ -112,7 +116,7 @@ func TestRouter(t *testing.T) {
}))
defer svr.Close()
selector := &config.PolicySelector{
policySelectorCfg := &config.PolicySelector{
Static: &config.StaticSelectorConf{
Policy: "default",
},
@@ -129,7 +133,9 @@ func TestRouter(t *testing.T) {
},
}
router := New(selector, policies, log.NewLogger())
reg := registry.GetRegistry()
sel := selector.NewSelector(selector.Registry(reg))
router := New(sel, policySelectorCfg, policies, log.NewLogger())
table := []matchertest{
{method: "PROPFIND", endpoint: "/dav/files/demo/", target: "ocdav"},