mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6052f2b396
I noticed that we're using a homegrown package for assertions. The functions are extremely similar to testify, but with enough slight differences to be confusing (for example, Equal takes its arguments in a different order). We already vendor testify, and it's used in a few places by tests. I also found some problems with pkg/testutil/assert. For example, the NotNil function seems to be broken. It checks the argument against "nil", which only works for an interface. If you pass in a nil map or slice, the equality check will fail. In the interest of avoiding NIH, I'm proposing replacing pkg/testutil/assert with testify. The test code looks almost the same, but we avoid the confusion of having two similar but slightly different assertion packages, and having to maintain our own package instead of using a commonly-used one. In the process, I found a few places where the tests should halt if an assertion fails, so I've made those cases (that I noticed) use "require" instead of "assert", and I've vendored the "require" package from testify alongside the already-present "assert" package. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
148 lines
5.8 KiB
Go
148 lines
5.8 KiB
Go
/*
|
|
* Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
package spew
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
)
|
|
|
|
// Errorf is a wrapper for fmt.Errorf that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the formatted string as a value that satisfies error. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Errorf(format, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Errorf(format string, a ...interface{}) (err error) {
|
|
return fmt.Errorf(format, convertArgs(a)...)
|
|
}
|
|
|
|
// Fprint is a wrapper for fmt.Fprint that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the number of bytes written and any write error encountered. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Fprint(w, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Fprint(w io.Writer, a ...interface{}) (n int, err error) {
|
|
return fmt.Fprint(w, convertArgs(a)...)
|
|
}
|
|
|
|
// Fprintf is a wrapper for fmt.Fprintf that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the number of bytes written and any write error encountered. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Fprintf(w, format, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Fprintf(w io.Writer, format string, a ...interface{}) (n int, err error) {
|
|
return fmt.Fprintf(w, format, convertArgs(a)...)
|
|
}
|
|
|
|
// Fprintln is a wrapper for fmt.Fprintln that treats each argument as if it
|
|
// passed with a default Formatter interface returned by NewFormatter. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Fprintln(w, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Fprintln(w io.Writer, a ...interface{}) (n int, err error) {
|
|
return fmt.Fprintln(w, convertArgs(a)...)
|
|
}
|
|
|
|
// Print is a wrapper for fmt.Print that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the number of bytes written and any write error encountered. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Print(spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Print(a ...interface{}) (n int, err error) {
|
|
return fmt.Print(convertArgs(a)...)
|
|
}
|
|
|
|
// Printf is a wrapper for fmt.Printf that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the number of bytes written and any write error encountered. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Printf(format, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Printf(format string, a ...interface{}) (n int, err error) {
|
|
return fmt.Printf(format, convertArgs(a)...)
|
|
}
|
|
|
|
// Println is a wrapper for fmt.Println that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the number of bytes written and any write error encountered. See
|
|
// NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Println(spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Println(a ...interface{}) (n int, err error) {
|
|
return fmt.Println(convertArgs(a)...)
|
|
}
|
|
|
|
// Sprint is a wrapper for fmt.Sprint that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the resulting string. See NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Sprint(spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Sprint(a ...interface{}) string {
|
|
return fmt.Sprint(convertArgs(a)...)
|
|
}
|
|
|
|
// Sprintf is a wrapper for fmt.Sprintf that treats each argument as if it were
|
|
// passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the resulting string. See NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Sprintf(format, spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Sprintf(format string, a ...interface{}) string {
|
|
return fmt.Sprintf(format, convertArgs(a)...)
|
|
}
|
|
|
|
// Sprintln is a wrapper for fmt.Sprintln that treats each argument as if it
|
|
// were passed with a default Formatter interface returned by NewFormatter. It
|
|
// returns the resulting string. See NewFormatter for formatting details.
|
|
//
|
|
// This function is shorthand for the following syntax:
|
|
//
|
|
// fmt.Sprintln(spew.NewFormatter(a), spew.NewFormatter(b))
|
|
func Sprintln(a ...interface{}) string {
|
|
return fmt.Sprintln(convertArgs(a)...)
|
|
}
|
|
|
|
// convertArgs accepts a slice of arguments and returns a slice of the same
|
|
// length with each argument converted to a default spew Formatter interface.
|
|
func convertArgs(args []interface{}) (formatters []interface{}) {
|
|
formatters = make([]interface{}, len(args))
|
|
for index, arg := range args {
|
|
formatters[index] = NewFormatter(arg)
|
|
}
|
|
return formatters
|
|
}
|