summaryrefslogtreecommitdiff
path: root/src/pkg/xml/xml_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/pkg/xml/xml_test.go')
-rw-r--r--src/pkg/xml/xml_test.go42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/pkg/xml/xml_test.go b/src/pkg/xml/xml_test.go
index e689949af..43d418c1e 100644
--- a/src/pkg/xml/xml_test.go
+++ b/src/pkg/xml/xml_test.go
@@ -5,11 +5,11 @@
package xml
import (
- "io";
- "os";
- "reflect";
- "strings";
- "testing";
+ "io"
+ "os"
+ "reflect"
+ "strings"
+ "testing"
)
const testInput = `
@@ -146,8 +146,8 @@ var xmlInput = []string{
}
type stringReader struct {
- s string;
- off int;
+ s string
+ off int
}
func (r *stringReader) Read(b []byte) (n int, err os.Error) {
@@ -155,29 +155,29 @@ func (r *stringReader) Read(b []byte) (n int, err os.Error) {
return 0, os.EOF
}
for r.off < len(r.s) && n < len(b) {
- b[n] = r.s[r.off];
- n++;
- r.off++;
+ b[n] = r.s[r.off]
+ n++
+ r.off++
}
- return;
+ return
}
func (r *stringReader) ReadByte() (b byte, err os.Error) {
if r.off >= len(r.s) {
return 0, os.EOF
}
- b = r.s[r.off];
- r.off++;
- return;
+ b = r.s[r.off]
+ r.off++
+ return
}
-func StringReader(s string) io.Reader { return &stringReader{s, 0} }
+func StringReader(s string) io.Reader { return &stringReader{s, 0} }
func TestRawToken(t *testing.T) {
- p := NewParser(StringReader(testInput));
+ p := NewParser(StringReader(testInput))
for i, want := range rawTokens {
- have, err := p.RawToken();
+ have, err := p.RawToken()
if err != nil {
t.Fatalf("token %d: unexpected error: %s", i, err)
}
@@ -188,10 +188,10 @@ func TestRawToken(t *testing.T) {
}
func TestToken(t *testing.T) {
- p := NewParser(StringReader(testInput));
+ p := NewParser(StringReader(testInput))
for i, want := range cookedTokens {
- have, err := p.Token();
+ have, err := p.Token()
if err != nil {
t.Fatalf("token %d: unexpected error: %s", i, err)
}
@@ -203,8 +203,8 @@ func TestToken(t *testing.T) {
func TestSyntax(t *testing.T) {
for i := range xmlInput {
- p := NewParser(StringReader(xmlInput[i]));
- var err os.Error;
+ p := NewParser(StringReader(xmlInput[i]))
+ var err os.Error
for _, err = p.Token(); err == nil; _, err = p.Token() {
}
if _, ok := err.(SyntaxError); !ok {