df1304ee03
From-SVN: r183539
360 lines
11 KiB
Go
360 lines
11 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package xml
|
|
|
|
import (
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// Stripped down Atom feed data structures.
|
|
|
|
func TestUnmarshalFeed(t *testing.T) {
|
|
var f Feed
|
|
if err := Unmarshal(strings.NewReader(atomFeedString), &f); err != nil {
|
|
t.Fatalf("Unmarshal: %s", err)
|
|
}
|
|
if !reflect.DeepEqual(f, atomFeed) {
|
|
t.Fatalf("have %#v\nwant %#v", f, atomFeed)
|
|
}
|
|
}
|
|
|
|
// 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<></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
|
|
http://code.google.com/p/rietveld/issues/detail?id=155
|
|
|
|
The server side of the protocol is trivial:
|
|
1. add a &lt;link rel=&quot;hub&quot; href=&quot;hub-server&quot;&gt; tag to all
|
|
feeds that will be pubsubhubbubbed.
|
|
2. every time one of those feeds changes, tell the hub
|
|
with a simple POST request.
|
|
|
|
I have tested this by adding debug prints to a local hub
|
|
server and checking that the server got the right publish
|
|
requests.
|
|
|
|
I can&#39;t quite get the server to work, but I think the bug
|
|
is not in my code. I think that the server expects to be
|
|
able to grab the feed and see the feed&#39;s actual URL in
|
|
the link rel=&quot;self&quot;, but the default value for that drops
|
|
the :port from the URL, and I cannot for the life of me
|
|
figure out how to get the Atom generator deep inside
|
|
django not to do that, or even where it is doing that,
|
|
or even what code is running to generate the Atom feed.
|
|
(I thought I knew but I added some assert False statements
|
|
and it kept running!)
|
|
|
|
Ignoring that particular problem, I would appreciate
|
|
feedback on the right way to get the two values at
|
|
the top of feeds.py marked NOTE(rsc).
|
|
|
|
|
|
</summary></entry><entry><title>rietveld: correct tab handling
|
|
</title><link href="http://codereview.appspot.com/124106" rel="alternate"></link><updated>2009-10-03T23:02:17+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:0a2a4f19bb815101f0ba2904aed7c35a</id><summary type="html">
|
|
This fixes the buggy tab rendering that can be seen at
|
|
http://codereview.appspot.com/116075/diff/1/2
|
|
|
|
The fundamental problem was that the tab code was
|
|
not being told what column the text began in, so it
|
|
didn&#39;t know where to put the tab stops. Another problem
|
|
was that some of the code assumed that string byte
|
|
offsets were the same as column offsets, which is only
|
|
true if there are no tabs.
|
|
|
|
In the process of fixing this, I cleaned up the arguments
|
|
to Fold and ExpandTabs and renamed them Break and
|
|
_ExpandTabs so that I could be sure that I found all the
|
|
call sites. I also wanted to verify that ExpandTabs was
|
|
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"`
|
|
}
|
|
|
|
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"`
|
|
}
|
|
|
|
type Link struct {
|
|
Rel string `xml:"rel,attr"`
|
|
Href string `xml:"href,attr"`
|
|
}
|
|
|
|
type Person struct {
|
|
Name string `xml:"name"`
|
|
URI string `xml:"uri"`
|
|
Email string `xml:"email"`
|
|
InnerXML string `xml:",innerxml"`
|
|
}
|
|
|
|
type Text struct {
|
|
Type string `xml:"type,attr"`
|
|
Body string `xml:",chardata"`
|
|
}
|
|
|
|
type Time string
|
|
|
|
var atomFeed = Feed{
|
|
XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
|
|
Title: "Code Review - My issues",
|
|
Link: []Link{
|
|
{Rel: "alternate", Href: "http://codereview.appspot.com/"},
|
|
{Rel: "self", Href: "http://codereview.appspot.com/rss/mine/rsc"},
|
|
},
|
|
Id: "http://codereview.appspot.com/",
|
|
Updated: "2009-10-04T01:35:58+00:00",
|
|
Author: Person{
|
|
Name: "rietveld<>",
|
|
InnerXML: "<name>rietveld<></name>",
|
|
},
|
|
Entry: []Entry{
|
|
{
|
|
Title: "rietveld: an attempt at pubsubhubbub\n",
|
|
Link: []Link{
|
|
{Rel: "alternate", Href: "http://codereview.appspot.com/126085"},
|
|
},
|
|
Updated: "2009-10-04T01:35:58+00:00",
|
|
Author: Person{
|
|
Name: "email-address-removed",
|
|
InnerXML: "<name>email-address-removed</name>",
|
|
},
|
|
Id: "urn:md5:134d9179c41f806be79b3a5f7877d19a",
|
|
Summary: Text{
|
|
Type: "html",
|
|
Body: `
|
|
An attempt at adding pubsubhubbub support to Rietveld.
|
|
http://code.google.com/p/pubsubhubbub
|
|
http://code.google.com/p/rietveld/issues/detail?id=155
|
|
|
|
The server side of the protocol is trivial:
|
|
1. add a <link rel="hub" href="hub-server"> tag to all
|
|
feeds that will be pubsubhubbubbed.
|
|
2. every time one of those feeds changes, tell the hub
|
|
with a simple POST request.
|
|
|
|
I have tested this by adding debug prints to a local hub
|
|
server and checking that the server got the right publish
|
|
requests.
|
|
|
|
I can't quite get the server to work, but I think the bug
|
|
is not in my code. I think that the server expects to be
|
|
able to grab the feed and see the feed's actual URL in
|
|
the link rel="self", but the default value for that drops
|
|
the :port from the URL, and I cannot for the life of me
|
|
figure out how to get the Atom generator deep inside
|
|
django not to do that, or even where it is doing that,
|
|
or even what code is running to generate the Atom feed.
|
|
(I thought I knew but I added some assert False statements
|
|
and it kept running!)
|
|
|
|
Ignoring that particular problem, I would appreciate
|
|
feedback on the right way to get the two values at
|
|
the top of feeds.py marked NOTE(rsc).
|
|
|
|
|
|
`,
|
|
},
|
|
},
|
|
{
|
|
Title: "rietveld: correct tab handling\n",
|
|
Link: []Link{
|
|
{Rel: "alternate", Href: "http://codereview.appspot.com/124106"},
|
|
},
|
|
Updated: "2009-10-03T23:02:17+00:00",
|
|
Author: Person{
|
|
Name: "email-address-removed",
|
|
InnerXML: "<name>email-address-removed</name>",
|
|
},
|
|
Id: "urn:md5:0a2a4f19bb815101f0ba2904aed7c35a",
|
|
Summary: Text{
|
|
Type: "html",
|
|
Body: `
|
|
This fixes the buggy tab rendering that can be seen at
|
|
http://codereview.appspot.com/116075/diff/1/2
|
|
|
|
The fundamental problem was that the tab code was
|
|
not being told what column the text began in, so it
|
|
didn't know where to put the tab stops. Another problem
|
|
was that some of the code assumed that string byte
|
|
offsets were the same as column offsets, which is only
|
|
true if there are no tabs.
|
|
|
|
In the process of fixing this, I cleaned up the arguments
|
|
to Fold and ExpandTabs and renamed them Break and
|
|
_ExpandTabs so that I could be sure that I found all the
|
|
call sites. I also wanted to verify that ExpandTabs was
|
|
not being used from outside intra_region_diff.py.
|
|
|
|
|
|
`,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
const pathTestString = `
|
|
<Result>
|
|
<Before>1</Before>
|
|
<Items>
|
|
<Item1>
|
|
<Value>A</Value>
|
|
</Item1>
|
|
<Item2>
|
|
<Value>B</Value>
|
|
</Item2>
|
|
<Item1>
|
|
<Value>C</Value>
|
|
<Value>D</Value>
|
|
</Item1>
|
|
<_>
|
|
<Value>E</Value>
|
|
</_>
|
|
</Items>
|
|
<After>2</After>
|
|
</Result>
|
|
`
|
|
|
|
type PathTestItem struct {
|
|
Value string
|
|
}
|
|
|
|
type PathTestA struct {
|
|
Items []PathTestItem `xml:">Item1"`
|
|
Before, After string
|
|
}
|
|
|
|
type PathTestB struct {
|
|
Other []PathTestItem `xml:"Items>Item1"`
|
|
Before, After string
|
|
}
|
|
|
|
type PathTestC struct {
|
|
Values1 []string `xml:"Items>Item1>Value"`
|
|
Values2 []string `xml:"Items>Item2>Value"`
|
|
Before, After string
|
|
}
|
|
|
|
type PathTestSet struct {
|
|
Item1 []PathTestItem
|
|
}
|
|
|
|
type PathTestD struct {
|
|
Other PathTestSet `xml:"Items"`
|
|
Before, After string
|
|
}
|
|
|
|
type PathTestE struct {
|
|
Underline string `xml:"Items>_>Value"`
|
|
Before, After string
|
|
}
|
|
|
|
var pathTests = []interface{}{
|
|
&PathTestA{Items: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
|
|
&PathTestB{Other: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
|
|
&PathTestC{Values1: []string{"A", "C", "D"}, Values2: []string{"B"}, Before: "1", After: "2"},
|
|
&PathTestD{Other: PathTestSet{Item1: []PathTestItem{{"A"}, {"D"}}}, Before: "1", After: "2"},
|
|
&PathTestE{Underline: "E", Before: "1", After: "2"},
|
|
}
|
|
|
|
func TestUnmarshalPaths(t *testing.T) {
|
|
for _, pt := range pathTests {
|
|
v := reflect.New(reflect.TypeOf(pt).Elem()).Interface()
|
|
if err := Unmarshal(strings.NewReader(pathTestString), v); err != nil {
|
|
t.Fatalf("Unmarshal: %s", err)
|
|
}
|
|
if !reflect.DeepEqual(v, pt) {
|
|
t.Fatalf("have %#v\nwant %#v", v, pt)
|
|
}
|
|
}
|
|
}
|
|
|
|
type BadPathTestA struct {
|
|
First string `xml:"items>item1"`
|
|
Other string `xml:"items>item2"`
|
|
Second string `xml:"items"`
|
|
}
|
|
|
|
type BadPathTestB struct {
|
|
Other string `xml:"items>item2>value"`
|
|
First string `xml:"items>item1"`
|
|
Second string `xml:"items>item1>value"`
|
|
}
|
|
|
|
type BadPathTestC struct {
|
|
First string
|
|
Second string `xml:"First"`
|
|
}
|
|
|
|
type BadPathTestD struct {
|
|
BadPathEmbeddedA
|
|
BadPathEmbeddedB
|
|
}
|
|
|
|
type BadPathEmbeddedA struct {
|
|
First string
|
|
}
|
|
|
|
type BadPathEmbeddedB struct {
|
|
Second string `xml:"First"`
|
|
}
|
|
|
|
var badPathTests = []struct {
|
|
v, e interface{}
|
|
}{
|
|
{&BadPathTestA{}, &TagPathError{reflect.TypeOf(BadPathTestA{}), "First", "items>item1", "Second", "items"}},
|
|
{&BadPathTestB{}, &TagPathError{reflect.TypeOf(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
|
|
{&BadPathTestC{}, &TagPathError{reflect.TypeOf(BadPathTestC{}), "First", "", "Second", "First"}},
|
|
{&BadPathTestD{}, &TagPathError{reflect.TypeOf(BadPathTestD{}), "First", "", "Second", "First"}},
|
|
}
|
|
|
|
func TestUnmarshalBadPaths(t *testing.T) {
|
|
for _, tt := range badPathTests {
|
|
err := Unmarshal(strings.NewReader(pathTestString), tt.v)
|
|
if !reflect.DeepEqual(err, tt.e) {
|
|
t.Fatalf("Unmarshal with %#v didn't fail properly:\nhave %#v,\nwant %#v", tt.v, err, tt.e)
|
|
}
|
|
}
|
|
}
|
|
|
|
const OK = "OK"
|
|
const withoutNameTypeData = `
|
|
<?xml version="1.0" charset="utf-8"?>
|
|
<Test3 Attr="OK" />`
|
|
|
|
type TestThree struct {
|
|
XMLName Name `xml:"Test3"`
|
|
Attr string `xml:",attr"`
|
|
}
|
|
|
|
func TestUnmarshalWithoutNameType(t *testing.T) {
|
|
var x TestThree
|
|
if err := Unmarshal(strings.NewReader(withoutNameTypeData), &x); err != nil {
|
|
t.Fatalf("Unmarshal: %s", err)
|
|
}
|
|
if x.Attr != OK {
|
|
t.Fatalf("have %v\nwant %v", x.Attr, OK)
|
|
}
|
|
}
|