diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-12 23:40:51 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-12 23:40:51 +0000 |
| commit | 46bc1fe2f5a3c7ee4273b99d700fecf1555f64e0 (patch) | |
| tree | 0c68629fac9d7c6f103b401c9063ef00ed259f06 /libgo/go/encoding/xml | |
| parent | dc15d51eb56c0efe84bf82b02ac2ba9a231ce69b (diff) | |
| download | ppe42-gcc-46bc1fe2f5a3c7ee4273b99d700fecf1555f64e0.tar.gz ppe42-gcc-46bc1fe2f5a3c7ee4273b99d700fecf1555f64e0.zip | |
libgo: Update to weekly.2011-11-18.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182266 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/encoding/xml')
| -rw-r--r-- | libgo/go/encoding/xml/xml_test.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libgo/go/encoding/xml/xml_test.go b/libgo/go/encoding/xml/xml_test.go index 6c874fadb7a..bcb22afde00 100644 --- a/libgo/go/encoding/xml/xml_test.go +++ b/libgo/go/encoding/xml/xml_test.go @@ -7,7 +7,6 @@ package xml import ( "bytes" "io" - "os" "reflect" "strings" "testing" @@ -43,17 +42,17 @@ var rawTokens = []Token{ CharData([]byte("World <>'\" 白鵬翔")), EndElement{Name{"", "hello"}}, CharData([]byte("\n ")), - StartElement{Name{"", "goodbye"}, nil}, + StartElement{Name{"", "goodbye"}, []Attr{}}, EndElement{Name{"", "goodbye"}}, CharData([]byte("\n ")), StartElement{Name{"", "outer"}, []Attr{{Name{"foo", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}}, CharData([]byte("\n ")), - StartElement{Name{"", "inner"}, nil}, + StartElement{Name{"", "inner"}, []Attr{}}, EndElement{Name{"", "inner"}}, CharData([]byte("\n ")), EndElement{Name{"", "outer"}}, CharData([]byte("\n ")), - StartElement{Name{"tag", "name"}, nil}, + StartElement{Name{"tag", "name"}, []Attr{}}, CharData([]byte("\n ")), CharData([]byte("Some text here.")), CharData([]byte("\n ")), @@ -77,17 +76,17 @@ var cookedTokens = []Token{ CharData([]byte("World <>'\" 白鵬翔")), EndElement{Name{"ns2", "hello"}}, CharData([]byte("\n ")), - StartElement{Name{"ns2", "goodbye"}, nil}, + StartElement{Name{"ns2", "goodbye"}, []Attr{}}, EndElement{Name{"ns2", "goodbye"}}, CharData([]byte("\n ")), StartElement{Name{"ns2", "outer"}, []Attr{{Name{"ns1", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}}, CharData([]byte("\n ")), - StartElement{Name{"ns2", "inner"}, nil}, + StartElement{Name{"ns2", "inner"}, []Attr{}}, EndElement{Name{"ns2", "inner"}}, CharData([]byte("\n ")), EndElement{Name{"ns2", "outer"}}, CharData([]byte("\n ")), - StartElement{Name{"ns3", "name"}, nil}, + StartElement{Name{"ns3", "name"}, []Attr{}}, CharData([]byte("\n ")), CharData([]byte("Some text here.")), CharData([]byte("\n ")), @@ -105,7 +104,7 @@ var rawTokensAltEncoding = []Token{ CharData([]byte("\n")), ProcInst{"xml", []byte(`version="1.0" encoding="x-testing-uppercase"`)}, CharData([]byte("\n")), - StartElement{Name{"", "tag"}, nil}, + StartElement{Name{"", "tag"}, []Attr{}}, CharData([]byte("value")), EndElement{Name{"", "tag"}}, } @@ -205,7 +204,7 @@ func (d *downCaser) ReadByte() (c byte, err error) { func (d *downCaser) Read(p []byte) (int, error) { d.t.Fatalf("unexpected Read call on downCaser reader") - return 0, os.EINVAL + panic("unreachable") } func TestRawTokenAltEncoding(t *testing.T) { |
