Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(421)

Delta Between Two Patch Sets: ssh/buffer_test.go

Issue 6207051: code review 6207051: go.crypto/ssh: introduce a circular buffer for chanReader (Closed)
Left Patch Set: diff -r d59e35c8940f https://code.google.com/p/go.crypto Created 11 years, 10 months ago
Right Patch Set: diff -r d59e35c8940f https://code.google.com/p/go.crypto Created 11 years, 10 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « ssh/buffer.go ('k') | ssh/client.go » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 // Copyright 2011 The Go Authors. All rights reserved. 1 // Copyright 2011 The Go Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style 2 // Use of this source code is governed by a BSD-style
3 // license that can be found in the LICENSE file. 3 // license that can be found in the LICENSE file.
4 4
5 package ssh 5 package ssh
6 6
7 import ( 7 import (
8 "io" 8 "io"
9 "testing" 9 "testing"
10 ) 10 )
11 11
12 var BYTES = []byte("abcdefghijklmnopqrstuvwxyz") 12 var BYTES = []byte("abcdefghijklmnopqrstuvwxyz")
13 13
14 func TestBufferReadWrite(t *testing.T) { 14 func TestBufferReadwrite(t *testing.T) {
15 b := newBuffer() 15 b := newBuffer()
16 » w, _ := b.Write(BYTES[:10]) 16 » b.write(BYTES[:10])
17 r, _ := b.Read(make([]byte, 10)) 17 r, _ := b.Read(make([]byte, 10))
18 » if w != r || r != 10 { 18 » if r != 10 {
19 » » t.Fatalf("Expected written == read == 10, written: %d, read %d", w, r) 19 » » t.Fatalf("Expected written == read == 10, written: 10, read %d", r)
20 } 20 }
21 21
22 b = newBuffer() 22 b = newBuffer()
23 » w, _ = b.Write(BYTES[:5]) 23 » b.write(BYTES[:5])
24 r, _ = b.Read(make([]byte, 10)) 24 r, _ = b.Read(make([]byte, 10))
25 » if w != 5 || r != 5 { 25 » if r != 5 {
26 » » t.Fatalf("Expected written == read == 5, written: %d, read %d", w, r) 26 » » t.Fatalf("Expected written == read == 5, written: 5, read %d", r )
27 } 27 }
28 28
29 b = newBuffer() 29 b = newBuffer()
30 » w, _ = b.Write(BYTES[:10]) 30 » b.write(BYTES[:10])
31 r, _ = b.Read(make([]byte, 5)) 31 r, _ = b.Read(make([]byte, 5))
32 » if w != 10 || r != 5 { 32 » if r != 5 {
33 » » t.Fatalf("Expected written == 10, read == 5, written: %d, read % d", w, r) 33 » » t.Fatalf("Expected written == 10, read == 5, written: 10, read % d", r)
34 } 34 }
35 35
36 b = newBuffer() 36 b = newBuffer()
37 » w, _ = b.Write(BYTES[:5]) 37 » b.write(BYTES[:5])
38 » w2, _ := b.Write(BYTES[5:15]) 38 » b.write(BYTES[5:15])
39 r, _ = b.Read(make([]byte, 10)) 39 r, _ = b.Read(make([]byte, 10))
40 r2, _ := b.Read(make([]byte, 10)) 40 r2, _ := b.Read(make([]byte, 10))
41 » if r != 10 || r2 != 5 || w+w2 != r+r2 { 41 » if r != 10 || r2 != 5 || 15 != r+r2 {
42 t.Fatal("Expected written == read == 15") 42 t.Fatal("Expected written == read == 15")
43 } 43 }
44 } 44 }
45 45
46 func TestBufferClose(t *testing.T) { 46 func TestBufferClose(t *testing.T) {
47 b := newBuffer() 47 b := newBuffer()
48 » w, _ := b.Write(BYTES[:10]) 48 » b.write(BYTES[:10])
49 b.eof() 49 b.eof()
50 _, err := b.Read(make([]byte, 5)) 50 _, err := b.Read(make([]byte, 5))
51 if err != nil { 51 if err != nil {
52 t.Fatal("expected read of 5 to not return EOF") 52 t.Fatal("expected read of 5 to not return EOF")
53 } 53 }
54 b = newBuffer() 54 b = newBuffer()
55 » w, _ = b.Write(BYTES[:10]) 55 » b.write(BYTES[:10])
56 b.eof() 56 b.eof()
57 r, err := b.Read(make([]byte, 5)) 57 r, err := b.Read(make([]byte, 5))
58 r2, err2 := b.Read(make([]byte, 10)) 58 r2, err2 := b.Read(make([]byte, 10))
59 if r != 5 || r2 != 5 || err != nil || err2 != nil { 59 if r != 5 || r2 != 5 || err != nil || err2 != nil {
60 t.Fatal("expected reads of 5 and 5") 60 t.Fatal("expected reads of 5 and 5")
61 } 61 }
62 62
63 b = newBuffer() 63 b = newBuffer()
64 » w, _ = b.Write(BYTES[:10]) 64 » b.write(BYTES[:10])
65 b.eof() 65 b.eof()
66 r, err = b.Read(make([]byte, 5)) 66 r, err = b.Read(make([]byte, 5))
67 r2, err2 = b.Read(make([]byte, 10)) 67 r2, err2 = b.Read(make([]byte, 10))
68 r3, err3 := b.Read(make([]byte, 10)) 68 r3, err3 := b.Read(make([]byte, 10))
69 if r != 5 || r2 != 5 || r3 != 0 || err != nil || err2 != nil || err3 != io.EOF { 69 if r != 5 || r2 != 5 || r3 != 0 || err != nil || err2 != nil || err3 != io.EOF {
70 t.Fatal("expected reads of 5 and 5 and 0, with EOF") 70 t.Fatal("expected reads of 5 and 5 and 0, with EOF")
71 } 71 }
72 72
73 b = newBuffer() 73 b = newBuffer()
74 » w, _ = b.Write(make([]byte, 5)) 74 » b.write(make([]byte, 5))
75 » w2, _ := b.Write(make([]byte, 10)) 75 » b.write(make([]byte, 10))
76 b.eof() 76 b.eof()
77 r, err = b.Read(make([]byte, 9)) 77 r, err = b.Read(make([]byte, 9))
78 r2, err2 = b.Read(make([]byte, 3)) 78 r2, err2 = b.Read(make([]byte, 3))
79 r3, err3 = b.Read(make([]byte, 3)) 79 r3, err3 = b.Read(make([]byte, 3))
80 r4, err4 := b.Read(make([]byte, 10)) 80 r4, err4 := b.Read(make([]byte, 10))
81 if err != nil || err2 != nil || err3 != nil || err4 != io.EOF { 81 if err != nil || err2 != nil || err3 != nil || err4 != io.EOF {
82 t.Fatalf("Expected EOF on forth read only, err=%v, err2=%v, err3 =%v, err4=%v", err, err2, err3, err4) 82 t.Fatalf("Expected EOF on forth read only, err=%v, err2=%v, err3 =%v, err4=%v", err, err2, err3, err4)
83 } 83 }
84 » if r != 9 || r2 != 3 || r3 != 3 || r4 != 0 || w != 5 || w2 != 10 { 84 » if r != 9 || r2 != 3 || r3 != 3 || r4 != 0 {
85 t.Fatal("Expected written == read == 15", r, r2, r3, r4) 85 t.Fatal("Expected written == read == 15", r, r2, r3, r4)
86 } 86 }
87 } 87 }
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b