an/go-pkg-xmlx
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove CharsetFunc as field for Document type and instead supply it as a parameter for all Document.LoadXXX methods. There should be no need to store the function pointer in the Document struct.

Browse source
This commit is contained in:
jim teeuwen 2012-02-29 11:21:35 +01:00
parent ebbd6b3656
commit 817a15ca8b
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xmlx_test.go
View file

@ -9,7 +9,7 @@ import "testing"
func TestLoadLocal(t *testing.T) {
doc := New()
if err := doc.LoadFile("test.xml"); err != nil {
if err := doc.LoadFile("test.xml", nil); err != nil {
t.Error(err.Error())
return
}
@ -23,7 +23,7 @@ func TestLoadLocal(t *testing.T) {
func TestWildcard(t *testing.T) {
doc := New()
if err := doc.LoadFile("test2.xml"); err != nil {
if err := doc.LoadFile("test2.xml", nil); err != nil {
t.Error(err.Error())
return
}
@ -39,7 +39,7 @@ func TestWildcard(t *testing.T) {
func _TestLoadRemote(t *testing.T) {
doc := New()
if err := doc.LoadUri("http://blog.golang.org/feeds/posts/default"); err != nil {
if err := doc.LoadUri("http://blog.golang.org/feeds/posts/default", nil); err != nil {
t.Error(err.Error())
return
}
@ -53,7 +53,7 @@ func _TestLoadRemote(t *testing.T) {
func TestSave(t *testing.T) {
doc := New()
if err := doc.LoadFile("test.xml"); err != nil {
if err := doc.LoadFile("test.xml", nil); err != nil {
t.Errorf("LoadFile(): %s", err)
return
}
@ -67,7 +67,7 @@ func TestSave(t *testing.T) {
func TestNodeSearch(t *testing.T) {
doc := New()
if err := doc.LoadFile("test1.xml"); err != nil {
if err := doc.LoadFile("test1.xml", nil); err != nil {
t.Errorf("LoadFile(): %s", err)
return
}
@ -95,7 +95,7 @@ type Image struct {
func TestUnmarshal(t *testing.T) {
doc := New()
err := doc.LoadFile("test1.xml")
err := doc.LoadFile("test1.xml", nil)
if err != nil {
t.Errorf("LoadFile(): %s", err)