Skip to content

Commit e44a5b2

Browse files
djthorpedjthorpe
committed
Updated tests
1 parent 0fecd22 commit e44a5b2

File tree

8 files changed

+41
-53
lines changed

8 files changed

+41
-53
lines changed

‎pkg/auth/manager_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ func Test_Auth_002(t *testing.T) {
301301

302302
// Create a new user
303303
user, err := manager.CreateUser(context.TODO(), schema.UserMeta{
304-
Name: types.StringPtr("test"),
304+
Name: types.StringPtr("test20"),
305305
Desc: types.StringPtr("test user"),
306306
Scope: []string{},
307307
Meta: map[string]any{},
@@ -312,7 +312,7 @@ func Test_Auth_002(t *testing.T) {
312312

313313
// Create a new user and archive
314314
archived, err := manager.CreateUser(context.TODO(), schema.UserMeta{
315-
Name: types.StringPtr("test2"),
315+
Name: types.StringPtr("test21"),
316316
Desc: types.StringPtr("test user"),
317317
Scope: []string{},
318318
Meta: map[string]any{},
@@ -372,7 +372,7 @@ func Test_Auth_002(t *testing.T) {
372372
t.Run("GetToken3", func(t *testing.T) {
373373
// Create a new user
374374
user, err := manager.CreateUser(context.TODO(), schema.UserMeta{
375-
Name: types.StringPtr("test3"),
375+
Name: types.StringPtr("test22"),
376376
Desc: types.StringPtr("test user"),
377377
Scope: []string{},
378378
Meta: map[string]any{},
@@ -498,7 +498,7 @@ func Test_Auth_003(t *testing.T) {
498498

499499
// Create a new user
500500
user, err := manager.CreateUser(context.TODO(), schema.UserMeta{
501-
Name: types.StringPtr("test"),
501+
Name: types.StringPtr("test30"),
502502
Desc: types.StringPtr("test user"),
503503
Scope: []string{},
504504
Meta: map[string]any{},

‎pkg/parser/parser.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func New(plugins ...server.Plugin) (*parser, error) {
3232
name := plugin.Name()
3333
if _, exists := p.meta[name]; exists {
3434
return nil, httpresponse.ErrConflict.Withf("duplicate plugin: %q", name)
35-
} else if meta, err := meta.New(plugin, name); err != nil {
35+
} else if meta, err := meta.New(plugin); err != nil {
3636
return nil, httpresponse.ErrInternalError.Withf("%s for %q", err, name)
3737
} else {
3838
p.meta[name] = meta
@@ -83,14 +83,17 @@ func (p *parser) jsonParse(root ast.Node) error {
8383

8484
// tree should contain <dict plugin:<dict values> plugin:<dict values> ...>
8585
for _, plugins := range root.Children() {
86+
if plugins.Type() != ast.Ident {
87+
return httpresponse.ErrBadRequest.Withf("expected identifier, got %s", plugins.Type())
88+
}
8689
plugin := plugins.Value().(string)
87-
if plugin, exists := p.meta[plugin]; !exists {
90+
if plugin_, exists := p.meta[plugin]; !exists {
8891
return httpresponse.ErrNotFound.Withf("plugin not found: %q", plugin)
8992
} else if children := plugins.Children(); len(children) != 1 {
9093
return httpresponse.ErrBadRequest.Withf("expected one child, got %d", len(children))
9194
} else if dict := children[0]; dict.Type() != ast.Dict {
9295
return httpresponse.ErrBadRequest.Withf("expected object, got %s", dict.Type())
93-
} else if err := plugin.Validate(dict.Value()); err != nil {
96+
} else if err := plugin_.Validate(dict.Value()); err != nil {
9497
return err
9598
}
9699
}

‎pkg/parser/parser_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
// Packages
7+
httprouter "github.com/mutablelogic/go-server/pkg/httprouter/config"
78
httpserver "github.com/mutablelogic/go-server/pkg/httpserver/config"
89
log "github.com/mutablelogic/go-server/pkg/logger/config"
910
parser "github.com/mutablelogic/go-server/pkg/parser"
@@ -36,7 +37,7 @@ func Test_Parser_003(t *testing.T) {
3637
assert := assert.New(t)
3738

3839
// Create a new parser
39-
parser, err := parser.New(httpserver.Config{})
40+
parser, err := parser.New(httpserver.Config{}, httprouter.Config{})
4041
if !assert.NoError(err) {
4142
t.FailNow()
4243
}

‎pkg/pgmanager/config/config_test.go‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pkg/pgmanager/schema/acl.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (acl ACLItem) RevokeTablespace(ctx context.Context, conn pg.Conn, name stri
160160

161161
func (acl ACLItem) exec(ctx context.Context, conn pg.Conn, role, sql string) error {
162162
// PUBLIC -> PUBLIC and role -> "role"
163-
if role == defaultAclRole {
163+
if role == DefaultAclRole {
164164
conn = conn.With("role", role)
165165
} else {
166166
conn = conn.With("role", types.DoubleQuote(role))
@@ -267,8 +267,8 @@ func (acl *ACLItem) UnmarshalJSON(data []byte) error {
267267
return httpresponse.ErrBadRequest.With("missing role")
268268
} else if role = strings.TrimSpace(role); role == "" {
269269
return httpresponse.ErrBadRequest.With("missing role")
270-
} else if strings.ToUpper(role) == defaultAclRole {
271-
acl.Role = defaultAclRole
270+
} else if strings.ToUpper(role) == DefaultAclRole {
271+
acl.Role = DefaultAclRole
272272
} else {
273273
acl.Role = role
274274
}
@@ -341,7 +341,7 @@ func (acl ACLItem) IsAll() bool {
341341

342342
func toRole(v string) string {
343343
if v == "" {
344-
return defaultAclRole
344+
return DefaultAclRole
345345
}
346346
return v
347347
}

‎pkg/pgmanager/schema/acl_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func Test_ACLItem_002(t *testing.T) {
2424
t.Run("2", func(t *testing.T) {
2525
acl, err := schema.NewACLItem("=r/miriam")
2626
if assert.NoError(err) {
27-
assert.Equal("public", acl.Role)
27+
assert.Equal(schema.DefaultAclRole, acl.Role)
2828
assert.Equal([]string{"SELECT"}, acl.Priv)
2929
assert.Equal("miriam", acl.Grantor)
3030
t.Log(acl)
@@ -36,7 +36,7 @@ func Test_ACLItem_002(t *testing.T) {
3636
if assert.NoError(err) {
3737
assert.Equal("miriam", acl.Role)
3838
assert.Equal([]string{"SELECT WITH GRANT OPTION", "UPDATE"}, acl.Priv)
39-
assert.Equal("public", acl.Grantor)
39+
assert.Equal(schema.DefaultAclRole, acl.Grantor)
4040
t.Log(acl)
4141
}
4242
})

‎pkg/pgmanager/schema/globals.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import (
1010
// GLOBALS
1111

1212
const (
13-
CatalogSchema = "pg_catalog"
14-
APIPrefix = "/pg/v1"
13+
CatalogSchema = "pg_catalog"
14+
APIPrefix = "/pg/v1"
15+
DefaultAclRole = "PUBLIC"
1516
)
1617

1718
const (
@@ -27,7 +28,6 @@ const (
2728
const (
2829
pgTimestampFormat = "2006-01-02 15:04:05"
2930
pgObfuscatedPassword = "********"
30-
defaultAclRole = "PUBLIC"
3131
defaultSchema = "public"
3232
reservedPrefix = "pg_"
3333
)

‎pkg/provider/meta/meta_test.go‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package meta_test
22

33
import (
4+
"context"
45
"testing"
56

67
// Packages
8+
server "github.com/mutablelogic/go-server"
79
meta "github.com/mutablelogic/go-server/pkg/provider/meta"
810
assert "github.com/stretchr/testify/assert"
911
)
@@ -12,25 +14,33 @@ type Test1 struct {
1214
A string
1315
}
1416

17+
func (t Test1) Name() string {
18+
return "Test1"
19+
}
20+
func (t Test1) Description() string {
21+
return "Test1"
22+
}
23+
func (t Test1) New(context.Context) (server.Task, error) {
24+
return nil, nil
25+
}
26+
27+
var _ server.Plugin = Test1{}
28+
1529
func Test_Meta_001(t *testing.T) {
1630
assert := assert.New(t)
1731

1832
t.Run("1", func(t *testing.T) {
19-
_, err := meta.New(nil, "")
20-
assert.Error(err)
21-
})
22-
t.Run("2", func(t *testing.T) {
23-
_, err := meta.New("hello, world", "")
33+
_, err := meta.New(nil)
2434
assert.Error(err)
2535
})
2636

27-
t.Run("3", func(t *testing.T) {
28-
_, err := meta.New(Test1{}, "")
37+
t.Run("2", func(t *testing.T) {
38+
_, err := meta.New(Test1{})
2939
assert.NoError(err)
3040
})
3141

32-
t.Run("4", func(t *testing.T) {
33-
_, err := meta.New(&Test1{}, "")
42+
t.Run("3", func(t *testing.T) {
43+
_, err := meta.New(&Test1{})
3444
assert.NoError(err)
3545
})
3646

@@ -40,7 +50,7 @@ func Test_Meta_002(t *testing.T) {
4050
assert := assert.New(t)
4151

4252
t.Run("1", func(t *testing.T) {
43-
meta, err := meta.New(Test1{}, "")
53+
meta, err := meta.New(Test1{})
4454
assert.NoError(err)
4555
assert.NotNil(meta)
4656
})

0 commit comments

Comments
 (0)