@ -8,6 +8,7 @@ import (
"fmt"
"math"
"os"
"path/filepath"
"reflect"
"regexp"
"runtime"
@ -144,7 +145,8 @@ func CallerInfo() []string {
if len ( parts ) > 1 {
dir := parts [ len ( parts ) - 2 ]
if ( dir != "assert" && dir != "mock" && dir != "require" ) || file == "mock_test.go" {
callers = append ( callers , fmt . Sprintf ( "%s:%d" , file , line ) )
path , _ := filepath . Abs ( file )
callers = append ( callers , fmt . Sprintf ( "%s:%d" , path , line ) )
}
}
@ -563,16 +565,17 @@ func isEmpty(object interface{}) bool {
switch objValue . Kind ( ) {
// collection types are empty when they have no element
case reflect . Array , reflect . Chan , reflect . Map , reflect . Slice :
case reflect . Chan , reflect . Map , reflect . Slice :
return objValue . Len ( ) == 0
// pointers are empty if nil or if the value they point to is empty
// pointers are empty if nil or if the value they point to is empty
case reflect . Ptr :
if objValue . IsNil ( ) {
return true
}
deref := objValue . Elem ( ) . Interface ( )
return isEmpty ( deref )
// for all other types, compare against the zero value
// for all other types, compare against the zero value
// array types are empty when they match their zero-initialized state
default :
zero := reflect . Zero ( objValue . Type ( ) )
return reflect . DeepEqual ( object , zero . Interface ( ) )
@ -815,7 +818,6 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
return true // we consider nil to be equal to the nil set
}
subsetValue := reflect . ValueOf ( subset )
defer func ( ) {
if e := recover ( ) ; e != nil {
ok = false
@ -825,14 +827,32 @@ func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok
listKind := reflect . TypeOf ( list ) . Kind ( )
subsetKind := reflect . TypeOf ( subset ) . Kind ( )
if listKind != reflect . Array && listKind != reflect . Slice {
if listKind != reflect . Array && listKind != reflect . Slice && listKind != reflect . Map {
return Fail ( t , fmt . Sprintf ( "%q has an unsupported type %s" , list , listKind ) , msgAndArgs ... )
}
if subsetKind != reflect . Array && subsetKind != reflect . Slice {
if subsetKind != reflect . Array && subsetKind != reflect . Slice && listKind != reflect . Map {
return Fail ( t , fmt . Sprintf ( "%q has an unsupported type %s" , subset , subsetKind ) , msgAndArgs ... )
}
subsetValue := reflect . ValueOf ( subset )
if subsetKind == reflect . Map && listKind == reflect . Map {
listValue := reflect . ValueOf ( list )
subsetKeys := subsetValue . MapKeys ( )
for i := 0 ; i < len ( subsetKeys ) ; i ++ {
subsetKey := subsetKeys [ i ]
subsetElement := subsetValue . MapIndex ( subsetKey ) . Interface ( )
listElement := listValue . MapIndex ( subsetKey ) . Interface ( )
if ! ObjectsAreEqual ( subsetElement , listElement ) {
return Fail ( t , fmt . Sprintf ( "\"%s\" does not contain \"%s\"" , list , subsetElement ) , msgAndArgs ... )
}
}
return true
}
for i := 0 ; i < subsetValue . Len ( ) ; i ++ {
element := subsetValue . Index ( i ) . Interface ( )
ok , found := containsElement ( list , element )
@ -859,7 +879,6 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
return Fail ( t , "nil is the empty set which is a subset of every set" , msgAndArgs ... )
}
subsetValue := reflect . ValueOf ( subset )
defer func ( ) {
if e := recover ( ) ; e != nil {
ok = false
@ -869,14 +888,32 @@ func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{})
listKind := reflect . TypeOf ( list ) . Kind ( )
subsetKind := reflect . TypeOf ( subset ) . Kind ( )
if listKind != reflect . Array && listKind != reflect . Slice {
if listKind != reflect . Array && listKind != reflect . Slice && listKind != reflect . Map {
return Fail ( t , fmt . Sprintf ( "%q has an unsupported type %s" , list , listKind ) , msgAndArgs ... )
}
if subsetKind != reflect . Array && subsetKind != reflect . Slice {
if subsetKind != reflect . Array && subsetKind != reflect . Slice && listKind != reflect . Map {
return Fail ( t , fmt . Sprintf ( "%q has an unsupported type %s" , subset , subsetKind ) , msgAndArgs ... )
}
subsetValue := reflect . ValueOf ( subset )
if subsetKind == reflect . Map && listKind == reflect . Map {
listValue := reflect . ValueOf ( list )
subsetKeys := subsetValue . MapKeys ( )
for i := 0 ; i < len ( subsetKeys ) ; i ++ {
subsetKey := subsetKeys [ i ]
subsetElement := subsetValue . MapIndex ( subsetKey ) . Interface ( )
listElement := listValue . MapIndex ( subsetKey ) . Interface ( )
if ! ObjectsAreEqual ( subsetElement , listElement ) {
return true
}
}
return Fail ( t , fmt . Sprintf ( "%q is a subset of %q" , subset , list ) , msgAndArgs ... )
}
for i := 0 ; i < subsetValue . Len ( ) ; i ++ {
element := subsetValue . Index ( i ) . Interface ( )
ok , found := containsElement ( list , element )
@ -1109,6 +1146,27 @@ func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration,
return true
}
// WithinRange asserts that a time is within a time range (inclusive).
//
// assert.WithinRange(t, time.Now(), time.Now().Add(-time.Second), time.Now().Add(time.Second))
func WithinRange ( t TestingT , actual , start , end time . Time , msgAndArgs ... interface { } ) bool {
if h , ok := t . ( tHelper ) ; ok {
h . Helper ( )
}
if end . Before ( start ) {
return Fail ( t , "Start should be before end" , msgAndArgs ... )
}
if actual . Before ( start ) {
return Fail ( t , fmt . Sprintf ( "Time %v expected to be in time range %v to %v, but is before the range" , actual , start , end ) , msgAndArgs ... )
} else if actual . After ( end ) {
return Fail ( t , fmt . Sprintf ( "Time %v expected to be in time range %v to %v, but is after the range" , actual , start , end ) , msgAndArgs ... )
}
return true
}
func toFloat ( x interface { } ) ( float64 , bool ) {
var xf float64
xok := true
tobi
4 years ago
committed by
GitHub