-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from Storytel/add-proto-matcher
Add proto matcher
- Loading branch information
Showing
6 changed files
with
116 additions
and
46 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 |
|---|---|---|
| @@ -1,17 +1,34 @@ | ||
| version: 2.1 | ||
| jobs: | ||
| build: | ||
| docker: | ||
| - image: circleci/golang:1.15 | ||
| environment: | ||
| GO111MODULE: "on" | ||
| steps: | ||
| - checkout | ||
| - run: go install github.com/mgechev/revive | ||
| - run: revive -config revive.toml | ||
| - run: go test -race -coverprofile=coverage.txt -covermode=atomic -v ./... | ||
| - run: | ||
| name: Upload Code Coverage Report | ||
| command: | | ||
| go get github.com/mattn/goveralls | ||
| goveralls -coverprofile=coverage.txt | ||
|
|
||
| orbs: | ||
| toolkit: storytel/toolkit@1 | ||
|
|
||
| parameters: | ||
| go-version: | ||
| type: string | ||
| default: "1.19" | ||
|
|
||
| workflows: | ||
| ci: | ||
| jobs: | ||
| - toolkit/go-ci: | ||
| context: gcloud-storytel-build | ||
| version: <<pipeline.parameters.go-version>> | ||
| revive: false | ||
| test_package: ./... | ||
| filters: | ||
| branches: | ||
| ignore: main | ||
| name: ci-pr-branch | ||
| sonarqube_mode: pr | ||
|
|
||
| - toolkit/go-ci: | ||
| context: gcloud-storytel-build | ||
| version: <<pipeline.parameters.go-version>> | ||
| revive: false | ||
| test_package: ./... | ||
| filters: | ||
| branches: | ||
| only: main | ||
| name: ci-base-branch | ||
| sonarqube_mode: base |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package matchers | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
| "google.golang.org/protobuf/proto" | ||
| ) | ||
|
|
||
| type ProtoMatcher struct { | ||
| data proto.Message | ||
| } | ||
|
|
||
| func (p *ProtoMatcher) Matches(x interface{}) bool { | ||
| pbx, ok := x.(proto.Message) | ||
| if !ok { | ||
| return false | ||
| } | ||
| return proto.Equal(p.data, pbx) | ||
| } | ||
|
|
||
| func (p *ProtoMatcher) String() string { | ||
| data, err := json.Marshal(p.data) | ||
| if err != nil { | ||
| return "<unknown>" | ||
| } | ||
| return string(data) | ||
| } | ||
|
|
||
| func Proto(x proto.Message) gomock.Matcher { | ||
| return &ProtoMatcher{data: x} | ||
| } |
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,42 @@ | ||
| package matchers_test | ||
|
|
||
| import ( | ||
| matchers "github.com/Storytel/gomock-matchers" | ||
| "github.com/stretchr/testify/assert" | ||
| "testing" | ||
|
|
||
| "google.golang.org/protobuf/types/known/structpb" | ||
| ) | ||
|
|
||
| func TestProtoMatcher(t *testing.T) { | ||
| data := &structpb.Struct{ | ||
| Fields: map[string]*structpb.Value{ | ||
| "Id": { | ||
| Kind: &structpb.Value_StringValue{ | ||
| StringValue: "1234", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| assert := assert.New(t) | ||
| m := matchers.Proto(data) | ||
| assert.True(m.Matches(data)) | ||
| } | ||
|
|
||
| func TestProtoMatcherString(t *testing.T) { | ||
| assert := assert.New(t) | ||
| data := &structpb.Struct{ | ||
| Fields: map[string]*structpb.Value{ | ||
| "abc": { | ||
| Kind: &structpb.Value_StringValue{ | ||
| StringValue: "123", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| expected := "{\"abc\":\"123\"}" | ||
| m := matchers.Proto(data) | ||
| assert.Equal(expected, m.String()) | ||
| } |
This file was deleted.
Oops, something went wrong.