Skip to content
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

Remove Assert Package 3/3 #1205

Merged
merged 12 commits into from
Sep 19, 2023
Merged

Remove Assert Package 3/3 #1205

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
732d172
refactor test in ./processor to use is. instead of assert package
AdamHaffar Sep 11, 2023
a33fb6f
Merge branch 'main' into adam/assert-packages
AdamHaffar Sep 11, 2023
b3a5114
Merge branch 'main' into adam/assert-packages
AdamHaffar Sep 13, 2023
636b641
refactor test files in ./foundation to use matryer instead.
AdamHaffar Sep 15, 2023
67d6196
Merge remote-tracking branch 'origin/adam/assert-packages' into adam/…
AdamHaffar Sep 15, 2023
551376d
cerrors_test fix, .GetStackTrace would return [] or nil and could not…
AdamHaffar Sep 16, 2023
3c85db3
lint fix
AdamHaffar Sep 16, 2023
e409ed5
Merge branch 'main' into adam/assert-packages
AdamHaffar Sep 16, 2023
2a98571
Merge branch 'main' into adam/assert-packages
AdamHaffar Sep 18, 2023
cd27b00
remove assert package
AdamHaffar Sep 18, 2023
f8d9588
refactor all tests in pkg/foundation/ that previously use assert pack…
AdamHaffar Sep 19, 2023
f695c8b
fix test
hariso Sep 19, 2023
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
23 changes: 13 additions & 10 deletions pkg/foundation/cerrors/cerrors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"runtime"
"testing"

"github.com/conduitio/conduit/pkg/foundation/assert"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/matryer/is"
)
Expand All @@ -45,22 +44,24 @@ func (w *unwrapPanicError) Unwrap() error {
}

func TestNew(t *testing.T) {
is := is.New(t)

err := newError()
s := fmt.Sprintf("%+v", err)
assert.Equal(
t,
is.Equal(
"foobar:\n github.com/conduitio/conduit/pkg/foundation/cerrors_test.newError\n "+helperFilePath+":26",
s,
)
}

func TestErrorf(t *testing.T) {
is := is.New(t)

err := cerrors.Errorf("caused by: %w", newError())
s := fmt.Sprintf("%+v", err)
assert.Equal(
t,
is.Equal(
"caused by:\n github.com/conduitio/conduit/pkg/foundation/cerrors_test.TestErrorf\n "+
testFileLocation+":58\n - "+
testFileLocation+":60\n - "+
"foobar:\n github.com/conduitio/conduit/pkg/foundation/cerrors_test.newError\n "+
helperFilePath+":26",
s,
Expand Down Expand Up @@ -90,7 +91,7 @@ func TestGetStackTrace(t *testing.T) {
{
Func: "github.com/conduitio/conduit/pkg/foundation/cerrors_test.TestGetStackTrace",
File: testFileLocation,
Line: 88,
Line: 89,
},
},
},
Expand Down Expand Up @@ -135,14 +136,16 @@ func TestGetStackTrace(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
is := is.New(t)

res := cerrors.GetStackTrace(tc.err)
if tc.expected == nil {
assert.Nil(t, res)
is.True(res == nil || len(res.([]cerrors.Frame)) == 0)
return
}
act, ok := res.([]cerrors.Frame)
assert.True(t, ok, "expected []cerrors.Frame")
assert.Equal(t, tc.expected, act)
is.True(ok) // expected []cerrors.Frame
is.Equal(tc.expected, act)
})
}
}
Expand Down
123 changes: 80 additions & 43 deletions pkg/orchestrator/processors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"testing"

"github.com/conduitio/conduit/pkg/connector"
"github.com/conduitio/conduit/pkg/foundation/assert"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/foundation/database/inmemory"
"github.com/conduitio/conduit/pkg/foundation/log"
Expand All @@ -31,6 +30,8 @@ import (
)

func TestProcessorOrchestrator_CreateOnPipeline_Success(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -70,11 +71,13 @@ func TestProcessorOrchestrator_CreateOnPipeline_Success(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, want.Type, want.Parent, want.Config)
assert.Ok(t, err)
assert.Equal(t, want, got)
is.NoErr(err)
is.Equal(want, got)
}

func TestProcessorOrchestrator_CreateOnPipeline_PipelineNotExist(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand All @@ -90,12 +93,14 @@ func TestProcessorOrchestrator_CreateOnPipeline_PipelineNotExist(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, "test-processor", parent, processor.Config{})
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
is.True(got == nil)
}

func TestProcessorOrchestrator_CreateOnPipeline_PipelineRunning(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand All @@ -114,13 +119,14 @@ func TestProcessorOrchestrator_CreateOnPipeline_PipelineRunning(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, "test-processor", parent, processor.Config{})
assert.Error(t, err)
assert.Equal(t, pipeline.ErrPipelineRunning, err)
assert.Nil(t, got)
is.True(err != nil)
is.Equal(pipeline.ErrPipelineRunning, err)
is.True(got == nil)
}

func TestProcessorOrchestrator_CreateOnPipeline_PipelineProvisionedByConfig(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand All @@ -146,6 +152,8 @@ func TestProcessorOrchestrator_CreateOnPipeline_PipelineProvisionedByConfig(t *t
}

func TestProcessorOrchestrator_CreateOnPipeline_CreateProcessorError(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -176,12 +184,14 @@ func TestProcessorOrchestrator_CreateOnPipeline_CreateProcessorError(t *testing.

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, "test-processor", parent, processor.Config{})
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
is.True(got == nil)
}

func TestProcessorOrchestrator_CreateOnPipeline_AddProcessorError(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -226,12 +236,14 @@ func TestProcessorOrchestrator_CreateOnPipeline_AddProcessorError(t *testing.T)

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, proc.Type, proc.Parent, proc.Config)
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
is.True(got == nil)
}

func TestProcessorOrchestrator_CreateOnConnector_Success(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -278,11 +290,13 @@ func TestProcessorOrchestrator_CreateOnConnector_Success(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, want.Type, want.Parent, want.Config)
assert.Ok(t, err)
assert.Equal(t, want, got)
is.NoErr(err)
is.Equal(want, got)
}

func TestProcessorOrchestrator_CreateOnConnector_ConnectorNotExist(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand All @@ -298,12 +312,14 @@ func TestProcessorOrchestrator_CreateOnConnector_ConnectorNotExist(t *testing.T)

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Create(ctx, "test-processor", parent, processor.Config{})
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
is.True(got == nil)
}

func TestProcessorOrchestrator_UpdateOnPipeline_Success(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -350,11 +366,13 @@ func TestProcessorOrchestrator_UpdateOnPipeline_Success(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Update(ctx, before.ID, newConfig)
assert.Ok(t, err)
assert.Equal(t, want, got)
is.NoErr(err)
is.Equal(want, got)
}

func TestProcessorOrchestrator_UpdateOnPipeline_ProcessorNotExist(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -385,12 +403,14 @@ func TestProcessorOrchestrator_UpdateOnPipeline_ProcessorNotExist(t *testing.T)

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Update(ctx, before.ID, newConfig)
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match")
is.True(got == nil)
}

func TestProcessorOrchestrator_UpdateOnPipeline_PipelineRunning(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -423,13 +443,14 @@ func TestProcessorOrchestrator_UpdateOnPipeline_PipelineRunning(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Update(ctx, before.ID, newConfig)
assert.Error(t, err)
assert.Equal(t, pipeline.ErrPipelineRunning, err)
assert.Nil(t, got)
is.True(err != nil)
is.Equal(pipeline.ErrPipelineRunning, err)
is.True(got == nil)
}

func TestProcessorOrchestrator_UpdateOnPipeline_ProcessorProvisionedByConfig(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -467,6 +488,8 @@ func TestProcessorOrchestrator_UpdateOnPipeline_ProcessorProvisionedByConfig(t *
}

func TestProcessorOrchestrator_UpdateOnPipeline_UpdateFail(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -514,12 +537,14 @@ func TestProcessorOrchestrator_UpdateOnPipeline_UpdateFail(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Update(ctx, before.ID, newConfig)
assert.Error(t, err)
assert.Equal(t, wantErr, err)
assert.Nil(t, got)
is.True(err != nil)
is.Equal(wantErr, err)
is.True(got == nil)
}

func TestProcessorOrchestrator_UpdateOnConnector_ConnectorNotExist(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand All @@ -544,12 +569,14 @@ func TestProcessorOrchestrator_UpdateOnConnector_ConnectorNotExist(t *testing.T)

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
got, err := orc.Processors.Update(ctx, want.ID, processor.Config{})
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
assert.Nil(t, got)
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
is.True(got == nil)
}

func TestProcessorOrchestrator_DeleteOnPipeline_Success(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -585,10 +612,12 @@ func TestProcessorOrchestrator_DeleteOnPipeline_Success(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Ok(t, err)
is.NoErr(err)
}

func TestProcessorOrchestrator_DeleteOnPipeline_ProcessorNotExist(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -616,11 +645,13 @@ func TestProcessorOrchestrator_DeleteOnPipeline_ProcessorNotExist(t *testing.T)

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
}

func TestProcessorOrchestrator_DeleteOnPipeline_PipelineRunning(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -650,11 +681,13 @@ func TestProcessorOrchestrator_DeleteOnPipeline_PipelineRunning(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Error(t, err)
assert.Equal(t, pipeline.ErrPipelineRunning, err)
is.True(err != nil)
is.Equal(pipeline.ErrPipelineRunning, err)
}

func TestProcessorOrchestrator_DeleteOnPipeline_Fail(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -688,11 +721,13 @@ func TestProcessorOrchestrator_DeleteOnPipeline_Fail(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Error(t, err)
assert.True(t, cerrors.Is(err, wantErr), "errors did not match")
is.True(err != nil)
is.True(cerrors.Is(err, wantErr)) // errors did not match
}

func TestProcessorOrchestrator_DeleteOnPipeline_RemoveProcessorFail(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -740,10 +775,12 @@ func TestProcessorOrchestrator_DeleteOnPipeline_RemoveProcessorFail(t *testing.T

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Error(t, err)
is.True(err != nil)
}

func TestProcessorOrchestrator_DeleteOnConnector_Fail(t *testing.T) {
is := is.New(t)

ctx := context.Background()
db := &inmemory.DB{}
plsMock, consMock, procsMock, pluginMock := newMockServices(t)
Expand Down Expand Up @@ -798,5 +835,5 @@ func TestProcessorOrchestrator_DeleteOnConnector_Fail(t *testing.T) {

orc := NewOrchestrator(db, log.Nop(), plsMock, consMock, procsMock, pluginMock)
err := orc.Processors.Delete(ctx, want.ID)
assert.Error(t, err)
is.True(err != nil)
}
Loading