Skip to content

Deep logging #23

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
shackra wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Deep logging #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c49f99
Call Unlock with defer
shackra Jan 31, 2020
cf8ca1c
Migrate to go mod
shackra Jan 31, 2020
6d4d86e
Remove blank line
shackra Jan 31, 2020
a4f9c17
Show string differences
shackra Jan 31, 2020
8ac7965
Inform when query was already triggered or arguments did not match
shackra Jan 31, 2020
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
5 changes: 5 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module github.com/Selvatico/go-mocket

go 1.13

require github.com/sergi/go-diff v1.1.0
14 changes: 14 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
25 changes: 20 additions & 5 deletions response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"reflect"
"strings"
"sync"

"github.com/sergi/go-diff/diffmatchpatch"
)

const (
Expand Down Expand Up @@ -129,8 +131,8 @@ func (fr *FakeResponse) isArgsMatch(args []driver.NamedValue) bool {
// isQueryMatch returns true if searched query is matched FakeResponse Pattern
func (fr *FakeResponse) isQueryMatch(query string) bool {
fr.mu.Lock()
defer fr.mu.Unlock()
defer fr.mu.Unlock()

if fr.Pattern == "" {
return true
}
Expand All @@ -143,18 +145,31 @@ func (fr *FakeResponse) isQueryMatch(query string) bool {
return true
}

if Catcher.Logging {
comp := diffmatchpatch.New()
diffs := comp.DiffMain(query, fr.Pattern, false)
fmt.Printf("query do not match with strict = %t:\n%s", fr.Strict, comp.DiffPrettyText(diffs))
}

return false
}

// IsMatch checks if both query and args matcher's return true and if this is Once mock
func (fr *FakeResponse) IsMatch(query string, args []driver.NamedValue) bool {
fr.mu.Lock()
defer fr.mu.Unlock()

if fr.Once && fr.Triggered {
fr.mu.Unlock()
if Catcher.Logging {
fmt.Println("query already triggered")
}
return false
}
fr.mu.Unlock()
return fr.isQueryMatch(query) && fr.isArgsMatch(args)
argsMatch := fr.isArgsMatch(args)
if Catcher.Logging && args != nil {
fmt.Printf("query has arguments, did they match? %t\n", argsMatch)
}
return fr.isQueryMatch(query) && argsMatch
}

// MarkAsTriggered marks response as executed. For one time catches it will not make this possible to execute anymore
Expand Down