Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
G
golang
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
golang
Commits
c6f23bb7
Commit
c6f23bb7
authored
Feb 20, 2013
by
Rob Pike
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image/png: use Scanner in reader_test.
R=nigeltao CC=golang-dev
https://golang.org/cl/7399044
parent
f7a77163
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
11 deletions
+15
-11
reader_test.go
src/pkg/image/png/reader_test.go
+15
-11
No files found.
src/pkg/image/png/reader_test.go
View file @
c6f23bb7
...
@@ -208,7 +208,7 @@ func TestReader(t *testing.T) {
...
@@ -208,7 +208,7 @@ func TestReader(t *testing.T) {
}
}
piper
,
pipew
:=
io
.
Pipe
()
piper
,
pipew
:=
io
.
Pipe
()
pb
:=
bufio
.
New
Read
er
(
piper
)
pb
:=
bufio
.
New
Scann
er
(
piper
)
go
sng
(
pipew
,
fn
,
img
)
go
sng
(
pipew
,
fn
,
img
)
defer
piper
.
Close
()
defer
piper
.
Close
()
...
@@ -219,7 +219,7 @@ func TestReader(t *testing.T) {
...
@@ -219,7 +219,7 @@ func TestReader(t *testing.T) {
continue
continue
}
}
defer
sf
.
Close
()
defer
sf
.
Close
()
sb
:=
bufio
.
New
Read
er
(
sf
)
sb
:=
bufio
.
New
Scann
er
(
sf
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Error
(
fn
,
err
)
t
.
Error
(
fn
,
err
)
continue
continue
...
@@ -227,24 +227,28 @@ func TestReader(t *testing.T) {
...
@@ -227,24 +227,28 @@ func TestReader(t *testing.T) {
// Compare the two, in SNG format, line by line.
// Compare the two, in SNG format, line by line.
for
{
for
{
p
s
,
perr
:=
pb
.
ReadString
(
'\n'
)
p
done
:=
pb
.
Scan
(
)
s
s
,
serr
:=
sb
.
ReadString
(
'\n'
)
s
done
:=
sb
.
Scan
(
)
if
p
err
==
io
.
EOF
&&
serr
==
io
.
EOF
{
if
p
done
&&
sdone
{
break
break
}
}
if
perr
!=
nil
{
if
pdone
||
sdone
{
t
.
Error
(
fn
,
perr
)
t
.
Errorf
(
"%s: Different sizes"
,
fn
)
break
}
if
serr
!=
nil
{
t
.
Error
(
fn
,
serr
)
break
break
}
}
ps
:=
pb
.
Text
()
ss
:=
sb
.
Text
()
if
ps
!=
ss
{
if
ps
!=
ss
{
t
.
Errorf
(
"%s: Mismatch
\n
%sversus
\n
%s
\n
"
,
fn
,
ps
,
ss
)
t
.
Errorf
(
"%s: Mismatch
\n
%sversus
\n
%s
\n
"
,
fn
,
ps
,
ss
)
break
break
}
}
}
}
if
pb
.
Err
()
!=
nil
{
t
.
Error
(
fn
,
pb
.
Err
())
}
if
sb
.
Err
()
!=
nil
{
t
.
Error
(
fn
,
sb
.
Err
())
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment