Skip to content

N
net
Commit 8f3641de authored by Nigel Tao's avatar Nigel Tao
Browse files
Options

webdav: rename the "etc/internal/xml" import. 

There is no semantic change to this commit. A follow-up commit will
change this package's behavior, but this preparatory commit will make
the follow-up's diff smaller, and less noisy.

Change-Id: I12e356fc1f29d3c4a7c3374aab4a1b1eefe01144
Reviewed-on: https://go-review.googlesource.com/21631Reviewed-by: 's avatarAndrew Gerrand <adg@golang.org>
parent bcb71dd1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
webdav/xml.go
View file @ 8f3641de
This diff is collapsed.
webdav/xml_test.go
View file @ 8f3641de
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"strings" "strings"
"testing" "testing"
"golang.org/x/net/webdav/internal/xml" ixml "golang.org/x/net/webdav/internal/xml"
) )
func TestReadLockInfo(t *testing.T) { func TestReadLockInfo(t *testing.T) {
...@@ -86,7 +86,7 @@ func TestReadLockInfo(t *testing.T) { ...@@ -86,7 +86,7 @@ func TestReadLockInfo(t *testing.T) {
" <D:owner>gopher</D:owner>\n" + " <D:owner>gopher</D:owner>\n" +
"</D:lockinfo>", "</D:lockinfo>",
lockInfo{ lockInfo{
XMLName: xml.Name{Space: "DAV:", Local: "lockinfo"}, XMLName: ixml.Name{Space: "DAV:", Local: "lockinfo"},
Exclusive: new(struct{}), Exclusive: new(struct{}),
Write: new(struct{}), Write: new(struct{}),
Owner: owner{ Owner: owner{
...@@ -105,7 +105,7 @@ func TestReadLockInfo(t *testing.T) { ...@@ -105,7 +105,7 @@ func TestReadLockInfo(t *testing.T) {
" </D:owner>\n" + " </D:owner>\n" +
"</D:lockinfo>", "</D:lockinfo>",
lockInfo{ lockInfo{
XMLName: xml.Name{Space: "DAV:", Local: "lockinfo"}, XMLName: ixml.Name{Space: "DAV:", Local: "lockinfo"},
Exclusive: new(struct{}), Exclusive: new(struct{}),
Write: new(struct{}), Write: new(struct{}),
Owner: owner{ Owner: owner{
...@@ -147,7 +147,7 @@ func TestReadPropfind(t *testing.T) { ...@@ -147,7 +147,7 @@ func TestReadPropfind(t *testing.T) {
" <A:propname/>\n" + " <A:propname/>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Propname: new(struct{}), Propname: new(struct{}),
}, },
}, { }, {
...@@ -163,7 +163,7 @@ func TestReadPropfind(t *testing.T) { ...@@ -163,7 +163,7 @@ func TestReadPropfind(t *testing.T) {
" <A:allprop/>\n" + " <A:allprop/>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Allprop: new(struct{}), Allprop: new(struct{}),
}, },
}, { }, {
...@@ -174,9 +174,9 @@ func TestReadPropfind(t *testing.T) { ...@@ -174,9 +174,9 @@ func TestReadPropfind(t *testing.T) {
" <A:include><A:displayname/></A:include>\n" + " <A:include><A:displayname/></A:include>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Allprop: new(struct{}), Allprop: new(struct{}),
Include: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Include: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: include followed by allprop", desc: "propfind: include followed by allprop",
...@@ -186,9 +186,9 @@ func TestReadPropfind(t *testing.T) { ...@@ -186,9 +186,9 @@ func TestReadPropfind(t *testing.T) {
" <A:allprop/>\n" + " <A:allprop/>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Allprop: new(struct{}), Allprop: new(struct{}),
Include: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Include: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: propfind", desc: "propfind: propfind",
...@@ -197,8 +197,8 @@ func TestReadPropfind(t *testing.T) { ...@@ -197,8 +197,8 @@ func TestReadPropfind(t *testing.T) {
" <A:prop><A:displayname/></A:prop>\n" + " <A:prop><A:displayname/></A:prop>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Prop: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Prop: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: prop with ignored comments", desc: "propfind: prop with ignored comments",
...@@ -210,8 +210,8 @@ func TestReadPropfind(t *testing.T) { ...@@ -210,8 +210,8 @@ func TestReadPropfind(t *testing.T) {
" </A:prop>\n" + " </A:prop>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Prop: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Prop: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: propfind with ignored whitespace", desc: "propfind: propfind with ignored whitespace",
...@@ -220,8 +220,8 @@ func TestReadPropfind(t *testing.T) { ...@@ -220,8 +220,8 @@ func TestReadPropfind(t *testing.T) {
" <A:prop> <A:displayname/></A:prop>\n" + " <A:prop> <A:displayname/></A:prop>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Prop: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Prop: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: propfind with ignored mixed-content", desc: "propfind: propfind with ignored mixed-content",
...@@ -230,8 +230,8 @@ func TestReadPropfind(t *testing.T) { ...@@ -230,8 +230,8 @@ func TestReadPropfind(t *testing.T) {
" <A:prop>foo<A:displayname/>bar</A:prop>\n" + " <A:prop>foo<A:displayname/>bar</A:prop>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Prop: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}}, Prop: propfindProps{ixml.Name{Space: "DAV:", Local: "displayname"}},
}, },
}, { }, {
desc: "propfind: propname with ignored element (section A.4)", desc: "propfind: propname with ignored element (section A.4)",
...@@ -241,7 +241,7 @@ func TestReadPropfind(t *testing.T) { ...@@ -241,7 +241,7 @@ func TestReadPropfind(t *testing.T) {
" <E:leave-out xmlns:E='E:'>*boss*</E:leave-out>\n" + " <E:leave-out xmlns:E='E:'>*boss*</E:leave-out>\n" +
"</A:propfind>", "</A:propfind>",
wantPF: propfind{ wantPF: propfind{
XMLName: xml.Name{Space: "DAV:", Local: "propfind"}, XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
Propname: new(struct{}), Propname: new(struct{}),
}, },
}, { }, {
...@@ -364,7 +364,7 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -364,7 +364,7 @@ func TestMultistatusWriter(t *testing.T) {
Href: []string{"http://example.com/foo"}, Href: []string{"http://example.com/foo"},
Propstat: []propstat{{ Propstat: []propstat{{
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{ XMLName: ixml.Name{
Space: "http://ns.example.com/", Space: "http://ns.example.com/",
Local: "Authors", Local: "Authors",
}, },
...@@ -372,7 +372,7 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -372,7 +372,7 @@ func TestMultistatusWriter(t *testing.T) {
Status: "HTTP/1.1 424 Failed Dependency", Status: "HTTP/1.1 424 Failed Dependency",
}, { }, {
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{ XMLName: ixml.Name{
Space: "http://ns.example.com/", Space: "http://ns.example.com/",
Local: "Copyright-Owner", Local: "Copyright-Owner",
}, },
...@@ -427,13 +427,13 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -427,13 +427,13 @@ func TestMultistatusWriter(t *testing.T) {
Href: []string{"http://example.com/foo"}, Href: []string{"http://example.com/foo"},
Propstat: []propstat{{ Propstat: []propstat{{
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "bigbox"}, XMLName: ixml.Name{Space: "http://ns.example.com/boxschema/", Local: "bigbox"},
InnerXML: []byte(`` + InnerXML: []byte(`` +
`<BoxType xmlns="http://ns.example.com/boxschema/">` + `<BoxType xmlns="http://ns.example.com/boxschema/">` +
`Box type A` + `Box type A` +
`</BoxType>`), `</BoxType>`),
}, { }, {
XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "author"}, XMLName: ixml.Name{Space: "http://ns.example.com/boxschema/", Local: "author"},
InnerXML: []byte(`` + InnerXML: []byte(`` +
`<Name xmlns="http://ns.example.com/boxschema/">` + `<Name xmlns="http://ns.example.com/boxschema/">` +
`J.J. Johnson` + `J.J. Johnson` +
...@@ -442,9 +442,9 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -442,9 +442,9 @@ func TestMultistatusWriter(t *testing.T) {
Status: "HTTP/1.1 200 OK", Status: "HTTP/1.1 200 OK",
}, { }, {
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "DingALing"}, XMLName: ixml.Name{Space: "http://ns.example.com/boxschema/", Local: "DingALing"},
}, { }, {
XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "Random"}, XMLName: ixml.Name{Space: "http://ns.example.com/boxschema/", Local: "Random"},
}}, }},
Status: "HTTP/1.1 403 Forbidden", Status: "HTTP/1.1 403 Forbidden",
ResponseDescription: "The user does not have access to the DingALing property.", ResponseDescription: "The user does not have access to the DingALing property.",
...@@ -494,7 +494,7 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -494,7 +494,7 @@ func TestMultistatusWriter(t *testing.T) {
responses: []response{{ responses: []response{{
Propstat: []propstat{{ Propstat: []propstat{{
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{ XMLName: ixml.Name{
Space: "http://example.com/", Space: "http://example.com/",
Local: "foo", Local: "foo",
}, },
...@@ -527,7 +527,7 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -527,7 +527,7 @@ func TestMultistatusWriter(t *testing.T) {
Href: []string{"http://example.com/foo"}, Href: []string{"http://example.com/foo"},
Propstat: []propstat{{ Propstat: []propstat{{
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{ XMLName: ixml.Name{
Space: "http://example.com/", Space: "http://example.com/",
Local: "foo", Local: "foo",
}, },
...@@ -548,7 +548,7 @@ func TestMultistatusWriter(t *testing.T) { ...@@ -548,7 +548,7 @@ func TestMultistatusWriter(t *testing.T) {
}, },
Propstat: []propstat{{ Propstat: []propstat{{
Prop: []Property{{ Prop: []Property{{
XMLName: xml.Name{ XMLName: ixml.Name{
Space: "http://example.com/", Space: "http://example.com/",
Local: "foo", Local: "foo",
}, },
...@@ -638,14 +638,14 @@ func TestReadProppatch(t *testing.T) { ...@@ -638,14 +638,14 @@ func TestReadProppatch(t *testing.T) {
`</D:propertyupdate>`, `</D:propertyupdate>`,
wantPP: []Proppatch{{ wantPP: []Proppatch{{
Props: []Property{{ Props: []Property{{
xml.Name{Space: "http://ns.example.com/z/", Local: "Authors"}, ixml.Name{Space: "http://ns.example.com/z/", Local: "Authors"},
"", "",
[]byte(`somevalue`), []byte(`somevalue`),
}}, }},
}, { }, {
Remove: true, Remove: true,
Props: []Property{{ Props: []Property{{
xml.Name{Space: "http://ns.example.com/z/", Local: "Copyright-Owner"}, ixml.Name{Space: "http://ns.example.com/z/", Local: "Copyright-Owner"},
"", "",
nil, nil,
}}, }},
...@@ -663,7 +663,7 @@ func TestReadProppatch(t *testing.T) { ...@@ -663,7 +663,7 @@ func TestReadProppatch(t *testing.T) {
`</D:propertyupdate>`, `</D:propertyupdate>`,
wantPP: []Proppatch{{ wantPP: []Proppatch{{
Props: []Property{{ Props: []Property{{
xml.Name{Space: "http://example.com/ns", Local: "foo"}, ixml.Name{Space: "http://example.com/ns", Local: "foo"},
"en", "en",
nil, nil,
}}, }},
...@@ -798,7 +798,7 @@ func TestUnmarshalXMLValue(t *testing.T) { ...@@ -798,7 +798,7 @@ func TestUnmarshalXMLValue(t *testing.T) {
var n xmlNormalizer var n xmlNormalizer
for _, tc := range testCases { for _, tc := range testCases {
d := xml.NewDecoder(strings.NewReader(tc.input)) d := ixml.NewDecoder(strings.NewReader(tc.input))
var v xmlValue var v xmlValue
if err := d.Decode(&v); err != nil { if err := d.Decode(&v); err != nil {
t.Errorf("%s: got error %v, want nil", tc.desc, err) t.Errorf("%s: got error %v, want nil", tc.desc, err)
...@@ -836,8 +836,8 @@ type xmlNormalizer struct { ...@@ -836,8 +836,8 @@ type xmlNormalizer struct {
// * Remove comments, if instructed to do so. // * Remove comments, if instructed to do so.
// //
func (n *xmlNormalizer) normalize(w io.Writer, r io.Reader) error { func (n *xmlNormalizer) normalize(w io.Writer, r io.Reader) error {
d := xml.NewDecoder(r) d := ixml.NewDecoder(r)
e := xml.NewEncoder(w) e := ixml.NewEncoder(w)
for { for {
t, err := d.Token() t, err := d.Token()
if err != nil { if err != nil {
...@@ -847,18 +847,18 @@ func (n *xmlNormalizer) normalize(w io.Writer, r io.Reader) error { ...@@ -847,18 +847,18 @@ func (n *xmlNormalizer) normalize(w io.Writer, r io.Reader) error {
return err return err
} }
switch val := t.(type) { switch val := t.(type) {
case xml.Directive, xml.ProcInst: case ixml.Directive, ixml.ProcInst:
continue continue
case xml.Comment: case ixml.Comment:
if n.omitComments { if n.omitComments {
continue continue
} }
case xml.CharData: case ixml.CharData:
if n.omitWhitespace && len(bytes.TrimSpace(val)) == 0 { if n.omitWhitespace && len(bytes.TrimSpace(val)) == 0 {
continue continue
} }
case xml.StartElement: case ixml.StartElement:
start, _ := xml.CopyToken(val).(xml.StartElement) start, _ := ixml.CopyToken(val).(ixml.StartElement)
attr := start.Attr[:0] attr := start.Attr[:0]
for _, a := range start.Attr { for _, a := range start.Attr {
if a.Name.Space == "xmlns" || a.Name.Local == "xmlns" { if a.Name.Space == "xmlns" || a.Name.Local == "xmlns" {
...@@ -893,7 +893,7 @@ func (n *xmlNormalizer) equalXML(a, b io.Reader) (bool, error) { ...@@ -893,7 +893,7 @@ func (n *xmlNormalizer) equalXML(a, b io.Reader) (bool, error) {
return normA == normB, nil return normA == normB, nil
} }
type byName []xml.Attr type byName []ixml.Attr
func (a byName) Len() int { return len(a) } func (a byName) Len() int { return len(a) }
func (a byName) Swap(i, j int) { a[i], a[j] = a[j], a[i] } func (a byName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment