comparison file/file_test.go @ 16:bfc035bd5132

cleaning up tests per go vet
author Paul Fisher <paul@pfish.zone>
date Fri, 30 Oct 2015 00:01:59 -0400
parents 9b4ec6b5c23e
children 00d30c67b56d
comparison
equal deleted inserted replaced
15:9b4ec6b5c23e 16:bfc035bd5132
69 } 69 }
70 70
71 func (f *testfile) read() string { 71 func (f *testfile) read() string {
72 contents, err := ioutil.ReadFile(f.filepath()) 72 contents, err := ioutil.ReadFile(f.filepath())
73 if err != nil { 73 if err != nil {
74 f.t.Fatalf("couldn't read output file: %q", err.Error()) 74 f.t.Fatalf("couldn't read output file: %v", err)
75 } 75 }
76 return string(contents) 76 return string(contents)
77 } 77 }
78 78
79 func (f *testfile) write(data string) { 79 func (f *testfile) write(data string) {
80 err := ioutil.WriteFile(f.filepath(), []byte(data), filemode) 80 err := ioutil.WriteFile(f.filepath(), []byte(data), filemode)
81 if err != nil { 81 if err != nil {
82 f.t.Fatalf("couldn't write output file: %q", err) 82 f.t.Fatalf("couldn't write output file: %v", err)
83 } 83 }
84 } 84 }
85 85
86 func (f *testfile) perms() os.FileMode { 86 func (f *testfile) perms() os.FileMode {
87 stat, err := os.Stat(f.filepath()) 87 stat, err := os.Stat(f.filepath())
88 if err != nil { 88 if err != nil {
89 f.t.Fatalf("couldn't stat output file: %q", err) 89 f.t.Fatalf("couldn't stat output file: %v", err)
90 } 90 }
91 return stat.Mode().Perm() 91 return stat.Mode().Perm()
92 } 92 }
93 93
94 func (f *testfile) cleanup() { 94 func (f *testfile) cleanup() {
102 err := s.Add(aSpooky) 102 err := s.Add(aSpooky)
103 if err != nil { 103 if err != nil {
104 t.Fatal(err.Error()) 104 t.Fatal(err.Error())
105 } 105 }
106 if f.perms() != filemode { 106 if f.perms() != filemode {
107 t.Errorf("want perms %q; got %q", filemode, f.perms()) 107 t.Errorf("want perms %o; got %o", filemode, f.perms())
108 } 108 }
109 want := fmt.Sprintf("%s\n%s\n", Banner, shadowSpooky) 109 want := fmt.Sprintf("%s\n%s\n", Banner, shadowSpooky)
110 got := f.read() 110 got := f.read()
111 if want != got { 111 if want != got {
112 t.Errorf("bad file contents: want %q; got %q", want, got) 112 t.Errorf("bad file contents: want %q; got %q", want, got)
170 f := mktest(t, "list") 170 f := mktest(t, "list")
171 defer f.cleanup() 171 defer f.cleanup()
172 s := New(f.filepath()) 172 s := New(f.filepath())
173 entries, err := s.AllEntries() 173 entries, err := s.AllEntries()
174 if len(entries) != 0 { 174 if len(entries) != 0 {
175 t.Errorf("want 0 entries; got %q", entries) 175 t.Errorf("want 0 entries; got %d", entries)
176 } 176 }
177 177
178 f.write(fmt.Sprintf("%s\n%s\n%s\n", Banner, shadowWhatever, shadowSpooky)) 178 f.write(fmt.Sprintf("%s\n%s\n%s\n", Banner, shadowWhatever, shadowSpooky))
179 entries, err = s.AllEntries() 179 entries, err = s.AllEntries()
180 if err != nil { 180 if err != nil {
181 t.Fatal(err.Error()) 181 t.Fatal(err.Error())
182 } 182 }
183 if len(entries) != 2 { 183 if len(entries) != 2 {
184 t.Fatalf("want len(entries) == 2; got entries = %q", entries) 184 t.Fatalf("want len(entries) == 2; got entries = %d", entries)
185 } 185 }
186 if *entries[0] != *aWhatever || *entries[1] != *aSpooky { 186 if *entries[0] != *aWhatever || *entries[1] != *aSpooky {
187 t.Fatalf("want {aWhatever, aSpooky}; got %q", entries) 187 t.Fatalf("want {aWhatever, aSpooky}; got %d", entries)
188 } 188 }
189 } 189 }
190 190
191 func TestAuthenticate(t *testing.T) { 191 func TestAuthenticate(t *testing.T) {
192 f := mktest(t, "auth") 192 f := mktest(t, "auth")
255 if err != nil { 255 if err != nil {
256 t.Fatalf(err.Error()) 256 t.Fatalf(err.Error())
257 } 257 }
258 ev := <-events 258 ev := <-events
259 if unlocked != ev { 259 if unlocked != ev {
260 t.Errorf("event 0: %q; got %q", unlocked, ev) 260 t.Errorf("event 0: %v; got %v", unlocked, ev)
261 } 261 }
262 ev = <-events 262 ev = <-events
263 if written != ev { 263 if written != ev {
264 t.Errorf("event 1: %q; got %q", written, ev) 264 t.Errorf("event 1: %v; got %v", written, ev)
265 } 265 }
266 266
267 want := fmt.Sprintf("%s\n%s\n", Banner, shadowWhatever) 267 want := fmt.Sprintf("%s\n%s\n", Banner, shadowWhatever)
268 got := f.read() 268 got := f.read()
269 if want != got { 269 if want != got {
296 if err != nil { 296 if err != nil {
297 t.Fatalf(err.Error()) 297 t.Fatalf(err.Error())
298 } 298 }
299 ev := <-events 299 ev := <-events
300 if failed != ev { 300 if failed != ev {
301 t.Errorf("event 0: want %q; got %q", failed, ev) 301 t.Errorf("event 0: want %v; got %v", failed, ev)
302 } 302 }
303 ev = <-events 303 ev = <-events
304 if unlocked != ev { 304 if unlocked != ev {
305 t.Errorf("event 1: want %q; got %q", unlocked, ev) 305 t.Errorf("event 1: want %v; got %v", unlocked, ev)
306 } 306 }
307 307
308 want := fmt.Sprintf("%s\n", Banner) 308 want := fmt.Sprintf("%s\n", Banner)
309 got := f.read() 309 got := f.read()
310 if want != got { 310 if want != got {