Update Go compiler, library, and testsuite on gcc 4.7 branch.

[pf3gnuchains/gcc-fork.git] / libgo / go / encoding / xml / read_test.go

diff --git a/libgo/go/encoding/xml/read_test.go b/libgo/go/encoding/xml/read_test.go
index 833eafc..8df09b3 100644 (file)
--- a/libgo/go/encoding/xml/read_test.go
+++ b/libgo/go/encoding/xml/read_test.go
@@ -7,6 +7,7 @@ package xml
 import (
        "reflect"
        "testing"
+       "time"
 )
 
 // Stripped down Atom feed data structures.
@@ -24,7 +25,7 @@ func TestUnmarshalFeed(t *testing.T) {
 // hget http://codereview.appspot.com/rss/mine/rsc
 const atomFeedString = `
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us"><title>Code Review - My issues</title><link href="http://codereview.appspot.com/" rel="alternate"></link><link href="http://codereview.appspot.com/rss/mine/rsc" rel="self"></link><id>http://codereview.appspot.com/</id><updated>2009-10-04T01:35:58+00:00</updated><author><name>rietveld&lt;&gt;</name></author><entry><title>rietveld: an attempt at pubsubhubbub
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us" updated="2009-10-04T01:35:58+00:00"><title>Code Review - My issues</title><link href="http://codereview.appspot.com/" rel="alternate"></link><link href="http://codereview.appspot.com/rss/mine/rsc" rel="self"></link><id>http://codereview.appspot.com/</id><author><name>rietveld&lt;&gt;</name></author><entry><title>rietveld: an attempt at pubsubhubbub
 </title><link href="http://codereview.appspot.com/126085" rel="alternate"></link><updated>2009-10-04T01:35:58+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:134d9179c41f806be79b3a5f7877d19a</id><summary type="html">
   An attempt at adding pubsubhubbub support to Rietveld.
 http://code.google.com/p/pubsubhubbub
@@ -78,26 +79,26 @@ not being used from outside intra_region_diff.py.
 </summary></entry></feed>         `
 
 type Feed struct {
-       XMLName Name    `xml:"http://www.w3.org/2005/Atom feed"`
-       Title   string  `xml:"title"`
-       Id      string  `xml:"id"`
-       Link    []Link  `xml:"link"`
-       Updated Time    `xml:"updated"`
-       Author  Person  `xml:"author"`
-       Entry   []Entry `xml:"entry"`
+       XMLName Name      `xml:"http://www.w3.org/2005/Atom feed"`
+       Title   string    `xml:"title"`
+       Id      string    `xml:"id"`
+       Link    []Link    `xml:"link"`
+       Updated time.Time `xml:"updated,attr"`
+       Author  Person    `xml:"author"`
+       Entry   []Entry   `xml:"entry"`
 }
 
 type Entry struct {
-       Title   string `xml:"title"`
-       Id      string `xml:"id"`
-       Link    []Link `xml:"link"`
-       Updated Time   `xml:"updated"`
-       Author  Person `xml:"author"`
-       Summary Text   `xml:"summary"`
+       Title   string    `xml:"title"`
+       Id      string    `xml:"id"`
+       Link    []Link    `xml:"link"`
+       Updated time.Time `xml:"updated"`
+       Author  Person    `xml:"author"`
+       Summary Text      `xml:"summary"`
 }
 
 type Link struct {
-       Rel  string `xml:"rel,attr"`
+       Rel  string `xml:"rel,attr,omitempty"`
        Href string `xml:"href,attr"`
 }
 
@@ -109,12 +110,10 @@ type Person struct {
 }
 
 type Text struct {
-       Type string `xml:"type,attr"`
+       Type string `xml:"type,attr,omitempty"`
        Body string `xml:",chardata"`
 }
 
-type Time string
-
 var atomFeed = Feed{
        XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
        Title:   "Code Review - My issues",
@@ -123,7 +122,7 @@ var atomFeed = Feed{
                {Rel: "self", Href: "http://codereview.appspot.com/rss/mine/rsc"},
        },
        Id:      "http://codereview.appspot.com/",
-       Updated: "2009-10-04T01:35:58+00:00",
+       Updated: ParseTime("2009-10-04T01:35:58+00:00"),
        Author: Person{
                Name:     "rietveld<>",
                InnerXML: "<name>rietveld&lt;&gt;</name>",
@@ -134,7 +133,7 @@ var atomFeed = Feed{
                        Link: []Link{
                                {Rel: "alternate", Href: "http://codereview.appspot.com/126085"},
                        },
-                       Updated: "2009-10-04T01:35:58+00:00",
+                       Updated: ParseTime("2009-10-04T01:35:58+00:00"),
                        Author: Person{
                                Name:     "email-address-removed",
                                InnerXML: "<name>email-address-removed</name>",
@@ -181,7 +180,7 @@ the top of feeds.py marked NOTE(rsc).
                        Link: []Link{
                                {Rel: "alternate", Href: "http://codereview.appspot.com/124106"},
                        },
-                       Updated: "2009-10-03T23:02:17+00:00",
+                       Updated: ParseTime("2009-10-03T23:02:17+00:00"),
                        Author: Person{
                                Name:     "email-address-removed",
                                InnerXML: "<name>email-address-removed</name>",