strucuture: rename IsValid to IsZero

This commit is contained in:
Fatih Arslan 2014-07-30 21:10:26 +03:00
parent 0ec62843ec
commit 778d3311fd
4 changed files with 18 additions and 18 deletions

View File

@ -46,7 +46,7 @@ f := structure.Fields(s)
n := structure.Name(s)
// Check if the fields of a struct is initialized or not.
if structure.IsValid(s) {
if structure.IsZero(s) {
fmt.Println("s is initialized")
}

View File

@ -79,7 +79,7 @@ func Values(s interface{}) []interface{} {
}
// IsValid returns true if all fields in a struct are initialized (non zero
// IsZero returns true if all fields in a struct are initialized (non zero
// value). A struct tag with the content of "-" ignores the checking of that
// particular field. Example:
//
@ -88,13 +88,13 @@ func Values(s interface{}) []interface{} {
//
// Note that only exported fields of a struct can be accessed, non exported
// fields will be neglected. It panics if s's kind is not struct.
func IsValid(s interface{}) bool {
func IsZero(s interface{}) bool {
v, fields := strctInfo(s)
for i := range fields {
val := v.Field(i)
if val.Kind() == reflect.Struct {
ok := IsValid(val.Interface())
ok := IsZero(val.Interface())
if !ok {
return false
}

View File

@ -96,7 +96,7 @@ func ExampleFields() {
// Fields: [Name LastAccessed Number]
}
func ExampleIsValid() {
func ExampleIsZero() {
// Let's define an Access struct. Note that the "Enabled" field is not
// going to be checked because we added the "structure" tag to the field.
type Access struct {
@ -110,7 +110,7 @@ func ExampleIsValid() {
a := &Access{
LastAccessed: time.Now(),
}
validA := IsValid(a)
validA := IsZero(a)
// Name and Number is initialized.
b := &Access{
@ -118,7 +118,7 @@ func ExampleIsValid() {
LastAccessed: time.Now(),
Number: 12345,
}
validB := IsValid(b)
validB := IsZero(b)
fmt.Printf("%#v\n", validA)
fmt.Printf("%#v\n", validB)

View File

@ -345,7 +345,7 @@ func TestFields_Anonymous(t *testing.T) {
}
}
func TestIsValid(t *testing.T) {
func TestIsZero(t *testing.T) {
var T = struct {
A string
B int
@ -356,9 +356,9 @@ func TestIsValid(t *testing.T) {
B: 2,
}
ok := IsValid(T)
ok := IsZero(T)
if ok {
t.Error("IsValid should return false because D is not initialized")
t.Error("IsZero should return false because D is not initialized")
}
var X = struct {
@ -368,13 +368,13 @@ func TestIsValid(t *testing.T) {
A: "a-value",
}
ok = IsValid(X)
ok = IsZero(X)
if ok {
t.Error("IsValid should return false because F is not initialized")
t.Error("IsZero should return false because F is not initialized")
}
}
func TestIsValid_Nested(t *testing.T) {
func TestIsZero_Nested(t *testing.T) {
type A struct {
Name string
D string
@ -387,13 +387,13 @@ func TestIsValid_Nested(t *testing.T) {
}
b := &B{A: a, C: 123}
ok := IsValid(b)
ok := IsZero(b)
if ok {
t.Error("IsValid should return false because D is not initialized")
t.Error("IsZero should return false because D is not initialized")
}
}
func TestIsValid_Anonymous(t *testing.T) {
func TestIsZero_Anonymous(t *testing.T) {
type A struct {
Name string
D string
@ -407,9 +407,9 @@ func TestIsValid_Anonymous(t *testing.T) {
b := &B{C: 123}
b.A = a
ok := IsValid(b)
ok := IsZero(b)
if ok {
t.Error("IsValid should return false because D is not initialized")
t.Error("IsZero should return false because D is not initialized")
}
}