Skip to content

Commit

Permalink
remove convertToSlice, use type switch instead
Browse files Browse the repository at this point in the history
  • Loading branch information
Larry Hitchon committed Apr 1, 2018
1 parent b5dd99c commit e71c956
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 23 deletions.
28 changes: 18 additions & 10 deletions assertion/contains.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,35 @@ import (
)

func contains(data interface{}, value string) (bool, error) {
if c, isSlice := convertToSlice(data); isSlice {
for _, element := range c {
switch v := data.(type) {
case []interface{}:
for _, element := range v {
if stringElement, isString := element.(string); isString {
if stringElement == value {
return true, nil
}
}
}
return false, nil
}
if s, isString := convertToString(data); isString {
if strings.Contains(s, value) {
case []string:
for _, stringElement := range v {
if stringElement == value {
return true, nil
}
}
return false, nil
case string:
if strings.Contains(v, value) {
return true, nil
}
return false, nil
default:
searchResult, err := JSONStringify(data)
if err != nil {
return false, err
}
return strings.Contains(searchResult, value), nil
}
searchResult, err := JSONStringify(data)
if err != nil {
return false, err
}
return strings.Contains(searchResult, value), nil
}

func notContains(data interface{}, value string) (bool, error) {
Expand Down
24 changes: 11 additions & 13 deletions assertion/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ import (
"path/filepath"
)

func convertToSlice(data interface{}) ([]interface{}, bool) {
s, ok := data.([]interface{})
return s, ok
}

func unquoted(s string) string {
if s[0] == '"' {
return s[1 : len(s)-1]
Expand Down Expand Up @@ -38,16 +33,19 @@ func isNotNull(s string) bool {
}

func isEmpty(data interface{}) bool {
if data == nil {
switch v := data.(type) {
case nil:
return true
case string:
return len(v) == 0
case []interface{}:
return len(v) == 0
case []map[string]interface{}:
return len(v) == 0
default:
fmt.Printf("%v %T\n", data, data)
return false
}
if s, isString := convertToString(data); isString {
return len(s) == 0
}
if c, isSlice := convertToSlice(data); isSlice {
return len(c) == 0
}
return false
}

func listsIntersect(list1 []string, list2 []string) bool {
Expand Down

0 comments on commit e71c956

Please sign in to comment.