github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go2idl: Consistently handle comments as []string

Browse Source 
This makes subsequent comment-tag PRs more consistent.
This commit is contained in:
Tim Hockin
2016-06-16 16:29:35 -07:00
parent 57c3196914
commit b01ac4726f
8 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/libs/go2idl/parser/parse_test.go
View File

@@ -197,13 +197,13 @@ type Blah struct {
if e, a := types.Struct, blahT.Kind; e != a {
t.Errorf("struct kind wrong, wanted %v, got %v", e, a)
}
if e, a := "Blah is a test.\nA test, I tell you.\n", blahT.CommentLines; e != a {
t.Errorf("struct comment wrong, wanted %v, got %v", e, a)
if e, a := []string{"Blah is a test.", "A test, I tell you."}, blahT.CommentLines; !reflect.DeepEqual(e, a) {
t.Errorf("struct comment wrong, wanted %q, got %q", e, a)
}
m := types.Member{
Name: "B",
Embedded: false,
CommentLines: "B is the second field.\nMultiline comments work.\n",
CommentLines: []string{"B is the second field.", "Multiline comments work."},
Tags: `json:"b"`,
Type: types.String,
}
@@ -216,7 +216,7 @@ func TestParseSecondClosestCommentLines(t *testing.T) {
const fileName = "base/foo/proto/foo.go"
testCases := []struct {
testFile map[string]string
expected string
expected []string
}{
{
map[string]string{fileName: `package foo
@@ -229,7 +229,7 @@ type Blah struct {
a int
}
`},
"Blah's SecondClosestCommentLines.\nAnother line.\n",
[]string{"Blah's SecondClosestCommentLines.", "Another line."},
},
{
map[string]string{fileName: `package foo
@@ -240,15 +240,15 @@ type Blah struct {
a int
}
`},
"Blah's SecondClosestCommentLines.\nAnother line.\n",
[]string{"Blah's SecondClosestCommentLines.", "Another line."},
},
}
for _, test := range testCases {
_, u, o := construct(t, test.testFile, namer.NewPublicNamer(0))
t.Logf("%#v", o)
blahT := u.Type(types.Name{Package: "base/foo/proto", Name: "Blah"})
if e, a := test.expected, blahT.SecondClosestCommentLines; e != a {
t.Errorf("struct second closest comment wrong, wanted %v, got %v", e, a)
if e, a := test.expected, blahT.SecondClosestCommentLines; !reflect.DeepEqual(e, a) {
t.Errorf("struct second closest comment wrong, wanted %q, got %q", e, a)
}
}
}