From e9a4aaaca767f3192c7a5855a47d8b7ce09be14d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 9 Jan 2015 17:43:44 -0800 Subject: [PATCH] helper/schema: full object test for addrToSchema --- helper/schema/field_reader.go | 3 ++- helper/schema/field_reader_multi.go | 3 --- helper/schema/field_reader_test.go | 11 +++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/helper/schema/field_reader.go b/helper/schema/field_reader.go index 136a7be0d3..4c3b28b9a7 100644 --- a/helper/schema/field_reader.go +++ b/helper/schema/field_reader.go @@ -58,7 +58,8 @@ func addrToSchema(addr []string, schemaMap map[string]*Schema) []*Schema { Elem: schemaMap, } - // TODO: test + // If we aren't given an address, then the user is requesting the + // full object, so we return the special value which is the full object. if len(addr) == 0 { return []*Schema{current} } diff --git a/helper/schema/field_reader_multi.go b/helper/schema/field_reader_multi.go index 2e5fa0ae4b..89ad3a86f2 100644 --- a/helper/schema/field_reader_multi.go +++ b/helper/schema/field_reader_multi.go @@ -42,10 +42,7 @@ func (r *MultiLevelFieldReader) ReadFieldMerge( var result FieldReadResult for _, l := range r.Levels { if r, ok := r.Readers[l]; ok { - println(fmt.Sprintf("GET %#v %s %#v", address, l, r)) out, err := r.ReadField(address) - println(fmt.Sprintf("%#v", out)) - println("======================================") if err != nil { return FieldReadResult{}, fmt.Errorf( "Error reading level %s: %s", l, err) diff --git a/helper/schema/field_reader_test.go b/helper/schema/field_reader_test.go index 64d2c3f2c3..200c9ca620 100644 --- a/helper/schema/field_reader_test.go +++ b/helper/schema/field_reader_test.go @@ -11,6 +11,17 @@ func TestAddrToSchema(t *testing.T) { Schema map[string]*Schema Result []ValueType }{ + "full object": { + []string{}, + map[string]*Schema{ + "list": &Schema{ + Type: TypeList, + Elem: &Schema{Type: TypeInt}, + }, + }, + []ValueType{typeObject}, + }, + "list": { []string{"list"}, map[string]*Schema{