Skip to content

feat: add comprehensive mock-based handler tests (189 tests) #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
retran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add comprehensive mock-based handler tests (189 tests) #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/marketplace/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var BaseURL = "https://marketplace-api.mendix.com"
type Content struct {
ContentID int `json:"contentId"`
Publisher string `json:"publisher"`
Type string `json:"type"` // "Module", "Widget", "Theme", "Starter App", ...
Type string `json:"type"` // "Module", "Widget", "Theme", "Starter App", ...
Categories []Category `json:"categories"`
SupportCategory string `json:"supportCategory"` // "Platform", "Community", "Deprecated", ...
LicenseURL string `json:"licenseUrl,omitempty"`
Expand Down
16 changes: 12 additions & 4 deletions mdl/backend/mock/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,16 @@ type MockBackend struct {
FindAllCustomWidgetTypesFunc func(widgetID string) ([]*mpr.RawCustomWidgetType, error)

// AgentEditorBackend
ListAgentEditorModelsFunc func() ([]*agenteditor.Model, error)
ListAgentEditorKnowledgeBasesFunc func() ([]*agenteditor.KnowledgeBase, error)
ListAgentEditorConsumedMCPServicesFunc func() ([]*agenteditor.ConsumedMCPService, error)
ListAgentEditorAgentsFunc func() ([]*agenteditor.Agent, error)
ListAgentEditorModelsFunc func() ([]*agenteditor.Model, error)
ListAgentEditorKnowledgeBasesFunc func() ([]*agenteditor.KnowledgeBase, error)
ListAgentEditorConsumedMCPServicesFunc func() ([]*agenteditor.ConsumedMCPService, error)
ListAgentEditorAgentsFunc func() ([]*agenteditor.Agent, error)
CreateAgentEditorModelFunc func(m *agenteditor.Model) error
DeleteAgentEditorModelFunc func(id string) error
CreateAgentEditorKnowledgeBaseFunc func(kb *agenteditor.KnowledgeBase) error
DeleteAgentEditorKnowledgeBaseFunc func(id string) error
CreateAgentEditorConsumedMCPServiceFunc func(svc *agenteditor.ConsumedMCPService) error
DeleteAgentEditorConsumedMCPServiceFunc func(id string) error
CreateAgentEditorAgentFunc func(a *agenteditor.Agent) error
DeleteAgentEditorAgentFunc func(id string) error
Comment thread
retran marked this conversation as resolved.
}
61 changes: 53 additions & 8 deletions mdl/backend/mock/mock_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,58 @@ func (m *MockBackend) ListAgentEditorAgents() ([]*agenteditor.Agent, error) {
return nil, nil
}

func (m *MockBackend) CreateAgentEditorModel(_ *agenteditor.Model) error { return nil }
func (m *MockBackend) DeleteAgentEditorModel(_ string) error { return nil }
func (m *MockBackend) CreateAgentEditorKnowledgeBase(_ *agenteditor.KnowledgeBase) error { return nil }
func (m *MockBackend) DeleteAgentEditorKnowledgeBase(_ string) error { return nil }
func (m *MockBackend) CreateAgentEditorConsumedMCPService(_ *agenteditor.ConsumedMCPService) error {
func (m *MockBackend) CreateAgentEditorModel(model *agenteditor.Model) error {
if m.CreateAgentEditorModelFunc != nil {
return m.CreateAgentEditorModelFunc(model)
}
return nil
}

func (m *MockBackend) DeleteAgentEditorModel(id string) error {
if m.DeleteAgentEditorModelFunc != nil {
return m.DeleteAgentEditorModelFunc(id)
}
return nil
}

func (m *MockBackend) CreateAgentEditorKnowledgeBase(kb *agenteditor.KnowledgeBase) error {
if m.CreateAgentEditorKnowledgeBaseFunc != nil {
return m.CreateAgentEditorKnowledgeBaseFunc(kb)
}
return nil
}

func (m *MockBackend) DeleteAgentEditorKnowledgeBase(id string) error {
if m.DeleteAgentEditorKnowledgeBaseFunc != nil {
return m.DeleteAgentEditorKnowledgeBaseFunc(id)
}
return nil
}

func (m *MockBackend) CreateAgentEditorConsumedMCPService(svc *agenteditor.ConsumedMCPService) error {
if m.CreateAgentEditorConsumedMCPServiceFunc != nil {
return m.CreateAgentEditorConsumedMCPServiceFunc(svc)
}
return nil
}

func (m *MockBackend) DeleteAgentEditorConsumedMCPService(id string) error {
if m.DeleteAgentEditorConsumedMCPServiceFunc != nil {
return m.DeleteAgentEditorConsumedMCPServiceFunc(id)
}
return nil
}

func (m *MockBackend) CreateAgentEditorAgent(a *agenteditor.Agent) error {
if m.CreateAgentEditorAgentFunc != nil {
return m.CreateAgentEditorAgentFunc(a)
}
return nil
}

func (m *MockBackend) DeleteAgentEditorAgent(id string) error {
if m.DeleteAgentEditorAgentFunc != nil {
return m.DeleteAgentEditorAgentFunc(id)
}
return nil
}
func (m *MockBackend) DeleteAgentEditorConsumedMCPService(_ string) error { return nil }
func (m *MockBackend) CreateAgentEditorAgent(_ *agenteditor.Agent) error { return nil }
func (m *MockBackend) DeleteAgentEditorAgent(_ string) error { return nil }
252 changes: 252 additions & 0 deletions mdl/executor/cmd_agenteditor_mock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
// SPDX-License-Identifier: Apache-2.0

package executor

import (
"testing"

"github.com/mendixlabs/mxcli/mdl/ast"
"github.com/mendixlabs/mxcli/mdl/backend/mock"
"github.com/mendixlabs/mxcli/model"
"github.com/mendixlabs/mxcli/sdk/agenteditor"
)

func TestShowAgentEditorModels_Mock(t *testing.T) {
mod := mkModule("M")
m1 := &agenteditor.Model{
BaseElement: model.BaseElement{ID: nextID("aem")},
ContainerID: mod.ID,
Name: "GPT4",
Provider: "MxCloudGenAI",
DisplayName: "GPT-4 Turbo",
Key: &agenteditor.ConstantRef{QualifiedName: "M.APIKey"},
}

h := mkHierarchy(mod)
withContainer(h, m1.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorModelsFunc: func() ([]*agenteditor.Model, error) { return []*agenteditor.Model{m1}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, showAgentEditorModels(ctx, ""))

out := buf.String()
assertContainsStr(t, out, "Qualified Name")
assertContainsStr(t, out, "Module")
assertContainsStr(t, out, "Provider")
assertContainsStr(t, out, "Key Constant")
assertContainsStr(t, out, "Display Name")
assertContainsStr(t, out, "M.GPT4")
assertContainsStr(t, out, "MxCloudGenAI")
assertContainsStr(t, out, "M.APIKey")
assertContainsStr(t, out, "GPT-4 Turbo")
}

func TestDescribeAgentEditorModel_Mock(t *testing.T) {
mod := mkModule("M")
m1 := &agenteditor.Model{
BaseElement: model.BaseElement{ID: nextID("aem")},
ContainerID: mod.ID,
Name: "GPT4",
Provider: "MxCloudGenAI",
Key: &agenteditor.ConstantRef{QualifiedName: "M.APIKey"},
}

h := mkHierarchy(mod)
withContainer(h, m1.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorModelsFunc: func() ([]*agenteditor.Model, error) { return []*agenteditor.Model{m1}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, describeAgentEditorModel(ctx, ast.QualifiedName{Module: "M", Name: "GPT4"}))

out := buf.String()
assertContainsStr(t, out, "CREATE MODEL")
assertContainsStr(t, out, "Provider")
assertContainsStr(t, out, "Key")
}

func TestShowAgentEditorAgents_Mock(t *testing.T) {
mod := mkModule("M")
a1 := &agenteditor.Agent{
BaseElement: model.BaseElement{ID: nextID("aea")},
ContainerID: mod.ID,
Name: "MyAgent",
UsageType: "Chat",
Model: &agenteditor.DocRef{QualifiedName: "M.GPT4"},
Tools: []agenteditor.AgentTool{{ID: "t1", Enabled: true}},
KBTools: []agenteditor.AgentKBTool{{ID: "kb1", Enabled: true}},
}

h := mkHierarchy(mod)
withContainer(h, a1.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorAgentsFunc: func() ([]*agenteditor.Agent, error) { return []*agenteditor.Agent{a1}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, showAgentEditorAgents(ctx, ""))

out := buf.String()
assertContainsStr(t, out, "Qualified Name")
assertContainsStr(t, out, "Usage")
assertContainsStr(t, out, "Model")
assertContainsStr(t, out, "Tools")
assertContainsStr(t, out, "KBs")
assertContainsStr(t, out, "M.MyAgent")
assertContainsStr(t, out, "Chat")
assertContainsStr(t, out, "M.GPT4")
}

func TestDescribeAgentEditorAgent_Mock(t *testing.T) {
mod := mkModule("M")
a1 := &agenteditor.Agent{
BaseElement: model.BaseElement{ID: nextID("aea")},
ContainerID: mod.ID,
Name: "MyAgent",
UsageType: "Chat",
Model: &agenteditor.DocRef{QualifiedName: "M.GPT4"},
}

h := mkHierarchy(mod)
withContainer(h, a1.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorAgentsFunc: func() ([]*agenteditor.Agent, error) { return []*agenteditor.Agent{a1}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, describeAgentEditorAgent(ctx, ast.QualifiedName{Module: "M", Name: "MyAgent"}))

out := buf.String()
assertContainsStr(t, out, "CREATE AGENT")
assertContainsStr(t, out, "UsageType")
assertContainsStr(t, out, "Model")
}

func TestShowAgentEditorKnowledgeBases_Mock(t *testing.T) {
mod := mkModule("M")
kb := &agenteditor.KnowledgeBase{
BaseElement: model.BaseElement{ID: nextID("aekb")},
ContainerID: mod.ID,
Name: "MyKB",
Provider: "MxCloudGenAI",
Key: &agenteditor.ConstantRef{QualifiedName: "M.KBKey"},
ModelDisplayName: "text-embedding-ada-002",
}

h := mkHierarchy(mod)
withContainer(h, kb.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorKnowledgeBasesFunc: func() ([]*agenteditor.KnowledgeBase, error) { return []*agenteditor.KnowledgeBase{kb}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, showAgentEditorKnowledgeBases(ctx, ""))

out := buf.String()
assertContainsStr(t, out, "Qualified Name")
assertContainsStr(t, out, "Provider")
assertContainsStr(t, out, "Key Constant")
assertContainsStr(t, out, "Embedding Model")
assertContainsStr(t, out, "M.MyKB")
assertContainsStr(t, out, "MxCloudGenAI")
assertContainsStr(t, out, "M.KBKey")
assertContainsStr(t, out, "text-embedding-ada-002")
}

func TestDescribeAgentEditorKnowledgeBase_Mock(t *testing.T) {
mod := mkModule("M")
kb := &agenteditor.KnowledgeBase{
BaseElement: model.BaseElement{ID: nextID("aekb")},
ContainerID: mod.ID,
Name: "MyKB",
Provider: "MxCloudGenAI",
Key: &agenteditor.ConstantRef{QualifiedName: "M.KBKey"},
}

h := mkHierarchy(mod)
withContainer(h, kb.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorKnowledgeBasesFunc: func() ([]*agenteditor.KnowledgeBase, error) { return []*agenteditor.KnowledgeBase{kb}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, describeAgentEditorKnowledgeBase(ctx, ast.QualifiedName{Module: "M", Name: "MyKB"}))

out := buf.String()
assertContainsStr(t, out, "CREATE KNOWLEDGE BASE")
assertContainsStr(t, out, "Provider")
}

func TestShowAgentEditorConsumedMCPServices_Mock(t *testing.T) {
mod := mkModule("M")
svc := &agenteditor.ConsumedMCPService{
BaseElement: model.BaseElement{ID: nextID("aemcp")},
ContainerID: mod.ID,
Name: "MySvc",
ProtocolVersion: "2025-03-26",
Version: "1.0.0",
ConnectionTimeoutSeconds: 30,
}

h := mkHierarchy(mod)
withContainer(h, svc.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorConsumedMCPServicesFunc: func() ([]*agenteditor.ConsumedMCPService, error) { return []*agenteditor.ConsumedMCPService{svc}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, showAgentEditorConsumedMCPServices(ctx, ""))

out := buf.String()
assertContainsStr(t, out, "Qualified Name")
assertContainsStr(t, out, "Protocol")
assertContainsStr(t, out, "Version")
assertContainsStr(t, out, "Timeout")
assertContainsStr(t, out, "M.MySvc")
assertContainsStr(t, out, "2025-03-26")
assertContainsStr(t, out, "1.0.0")
}

func TestDescribeAgentEditorConsumedMCPService_Mock(t *testing.T) {
mod := mkModule("M")
svc := &agenteditor.ConsumedMCPService{
BaseElement: model.BaseElement{ID: nextID("aemcp")},
ContainerID: mod.ID,
Name: "MySvc",
ProtocolVersion: "2025-03-26",
Version: "1.0.0",
ConnectionTimeoutSeconds: 30,
}

h := mkHierarchy(mod)
withContainer(h, svc.ContainerID, mod.ID)

mb := &mock.MockBackend{
IsConnectedFunc: func() bool { return true },
ListAgentEditorConsumedMCPServicesFunc: func() ([]*agenteditor.ConsumedMCPService, error) { return []*agenteditor.ConsumedMCPService{svc}, nil },
}

ctx, buf := newMockCtx(t, withBackend(mb), withHierarchy(h))
assertNoError(t, describeAgentEditorConsumedMCPService(ctx, ast.QualifiedName{Module: "M", Name: "MySvc"}))

out := buf.String()
assertContainsStr(t, out, "CREATE CONSUMED MCP SERVICE")
assertContainsStr(t, out, "ProtocolVersion")
}
20 changes: 10 additions & 10 deletions mdl/executor/cmd_agenteditor_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,17 @@ func execCreateAgentEditorModel(ctx *ExecContext, s *ast.CreateModelStmt) error
}

m := &agenteditor.Model{
ContainerID: module.ID,
Name: s.Name.Name,
ContainerID: module.ID,
Name: s.Name.Name,
Documentation: s.Documentation,
Provider: provider,
Key: keyRef,
DisplayName: s.DisplayName,
KeyName: s.KeyName,
KeyID: s.KeyID,
Environment: s.Environment,
ResourceName: s.ResourceName,
DeepLinkURL: s.DeepLinkURL,
Provider: provider,
Key: keyRef,
DisplayName: s.DisplayName,
KeyName: s.KeyName,
KeyID: s.KeyID,
Environment: s.Environment,
ResourceName: s.ResourceName,
DeepLinkURL: s.DeepLinkURL,
}

if err := ctx.Backend.CreateAgentEditorModel(m); err != nil {
Expand Down
Loading
Loading