Skip to content

Commit 614f916

Browse files
mcuadrosmcuadros
committed
test: use WriteFile function and code style
1 parent d9871ea commit 614f916

File tree

1 file changed

+33
-42
lines changed

1 file changed

+33
-42
lines changed

‎test/fs_suite.go

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -215,16 +215,10 @@ func (s *FilesystemSuite) TestFileCreateReadSeek(c *C) {
215215
}
216216

217217
func (s *FilesystemSuite) TestFileOpenReadSeek(c *C) {
218-
f, err := s.FS.Create("foo")
219-
c.Assert(err, IsNil)
220-
221-
n, err := f.Write([]byte("0123456789abcdefghijklmnopqrstuvwxyz"))
218+
err := WriteFile(s.FS, "foo", []byte("0123456789abcdefghijklmnopqrstuvwxyz"), 0644)
222219
c.Assert(err, IsNil)
223-
c.Assert(n, Equals, 36)
224-
225-
c.Assert(f.Close(), IsNil)
226220

227-
f, err = s.FS.Open("foo")
221+
f, err := s.FS.Open("foo")
228222
c.Assert(err, IsNil)
229223

230224
p, err := f.Seek(10, io.SeekStart)
@@ -248,9 +242,8 @@ func (s *FilesystemSuite) TestFileCloseTwice(c *C) {
248242
func (s *FilesystemSuite) TestReadDirAndDir(c *C) {
249243
files := []string{"foo", "bar", "qux/baz", "qux/qux"}
250244
for _, name := range files {
251-
f, err := s.FS.Create(name)
245+
err := WriteFile(s.FS, name, nil, 0644)
252246
c.Assert(err, IsNil)
253-
c.Assert(f.Close(), IsNil)
254247
}
255248

256249
info, err := s.FS.ReadDir("/")
@@ -268,12 +261,8 @@ func (s *FilesystemSuite) TestReadDirAndDir(c *C) {
268261
}
269262

270263
func (s *FilesystemSuite) TestReadDirFileInfo(c *C) {
271-
f, err := s.FS.Create("foo")
272-
c.Assert(err, IsNil)
273-
n, err := f.Write([]byte{'F', 'O', 'O'})
274-
c.Assert(n, Equals, 3)
264+
err := WriteFile(s.FS, "foo", []byte{'F', 'O', 'O'}, 0644)
275265
c.Assert(err, IsNil)
276-
c.Assert(f.Close(), IsNil)
277266

278267
info, err := s.FS.ReadDir("/")
279268
c.Assert(err, IsNil)
@@ -287,12 +276,8 @@ func (s *FilesystemSuite) TestReadDirFileInfo(c *C) {
287276
func (s *FilesystemSuite) TestReadDirFileInfoDirs(c *C) {
288277
files := []string{"qux/baz/foo"}
289278
for _, name := range files {
290-
f, err := s.FS.Create(name)
291-
c.Assert(err, IsNil)
292-
n, err := f.Write([]byte{'F', 'O', 'O'})
293-
c.Assert(n, Equals, 3)
279+
err := WriteFile(s.FS, name, []byte{'F', 'O', 'O'}, 0644)
294280
c.Assert(err, IsNil)
295-
c.Assert(f.Close(), IsNil)
296281
}
297282

298283
info, err := s.FS.ReadDir("qux")
@@ -320,9 +305,8 @@ func (s *FilesystemSuite) TestStatNonExistent(c *C) {
320305
func (s *FilesystemSuite) TestDirStat(c *C) {
321306
files := []string{"foo", "bar", "qux/baz", "qux/qux"}
322307
for _, name := range files {
323-
f, err := s.FS.Create(name)
308+
err := WriteFile(s.FS, name, nil, 0644)
324309
c.Assert(err, IsNil)
325-
c.Assert(f.Close(), IsNil)
326310
}
327311

328312
// Some implementations detect directories based on a prefix
@@ -358,9 +342,8 @@ func (s *FilesystemSuite) TestCreateInDir(c *C) {
358342
}
359343

360344
func (s *FilesystemSuite) TestRename(c *C) {
361-
f, err := s.FS.Create("foo")
345+
err := WriteFile(s.FS, "foo", nil, 0644)
362346
c.Assert(err, IsNil)
363-
c.Assert(f.Close(), IsNil)
364347

365348
err = s.FS.Rename("foo", "bar")
366349
c.Assert(err, IsNil)
@@ -394,9 +377,8 @@ func (s *FilesystemSuite) TestTempFileFullWithPath(c *C) {
394377
}
395378

396379
func (s *FilesystemSuite) TestOpenAndWrite(c *C) {
397-
f, err := s.FS.Create("foo")
380+
err := WriteFile(s.FS, "foo", nil, 0644)
398381
c.Assert(err, IsNil)
399-
c.Assert(f.Close(), IsNil)
400382

401383
foo, err := s.FS.Open("foo")
402384
c.Assert(foo, NotNil)
@@ -408,11 +390,8 @@ func (s *FilesystemSuite) TestOpenAndWrite(c *C) {
408390
}
409391

410392
func (s *FilesystemSuite) TestOpenAndStat(c *C) {
411-
f, err := s.FS.Create("foo")
412-
c.Assert(err, IsNil)
413-
_, err = f.Write([]byte("foo"))
393+
err := WriteFile(s.FS, "foo", []byte("foo"), 0644)
414394
c.Assert(err, IsNil)
415-
c.Assert(f.Close(), IsNil)
416395

417396
foo, err := s.FS.Open("foo")
418397
c.Assert(foo, NotNil)
@@ -442,11 +421,10 @@ func (s *FilesystemSuite) TestRemoveNonExisting(c *C) {
442421
}
443422

444423
func (s *FilesystemSuite) TestRemoveNotEmptyDir(c *C) {
445-
f, err := s.FS.Create("foo/bar")
424+
err := WriteFile(s.FS, "foo", nil, 0644)
446425
c.Assert(err, IsNil)
447-
c.Assert(f.Close(), IsNil)
448426

449-
err = s.FS.Remove("foo")
427+
err = s.FS.Remove("no-exists")
450428
c.Assert(err, NotNil)
451429
}
452430

@@ -474,8 +452,10 @@ func (s *FilesystemSuite) TestReadAtOnReadWrite(c *C) {
474452
c.Assert(err, IsNil)
475453
_, err = f.Write([]byte("abcdefg"))
476454
c.Assert(err, IsNil)
455+
477456
rf, ok := f.(io.ReaderAt)
478457
c.Assert(ok, Equals, true)
458+
479459
b := make([]byte, 3)
480460
n, err := rf.ReadAt(b, 2)
481461
c.Assert(err, IsNil)
@@ -485,16 +465,15 @@ func (s *FilesystemSuite) TestReadAtOnReadWrite(c *C) {
485465
}
486466

487467
func (s *FilesystemSuite) TestReadAtOnReadOnly(c *C) {
488-
f, err := s.FS.Create("foo")
489-
c.Assert(err, IsNil)
490-
_, err = f.Write([]byte("abcdefg"))
468+
err := WriteFile(s.FS, "foo", []byte("abcdefg"), 0644)
491469
c.Assert(err, IsNil)
492-
c.Assert(f.Close(), IsNil)
493470

494-
f, err = s.FS.Open("foo")
471+
f, err := s.FS.Open("foo")
495472
c.Assert(err, IsNil)
473+
496474
rf, ok := f.(io.ReaderAt)
497475
c.Assert(ok, Equals, true)
476+
498477
b := make([]byte, 3)
499478
n, err := rf.ReadAt(b, 2)
500479
c.Assert(err, IsNil)
@@ -548,9 +527,8 @@ func (s *FilesystemSuite) TestRemoveAll(c *C) {
548527
}
549528

550529
for _, fname := range fnames {
551-
f, err := s.FS.Create(fname)
530+
err := WriteFile(s.FS, fname, nil, 0644)
552531
c.Assert(err, IsNil)
553-
c.Assert(f.Close(), IsNil)
554532
}
555533

556534
c.Assert(RemoveAll(s.FS, "foo"), IsNil)
@@ -575,9 +553,8 @@ func (s *FilesystemSuite) TestRemoveAllRelative(c *C) {
575553
}
576554

577555
for _, fname := range fnames {
578-
f, err := s.FS.Create(fname)
556+
err := WriteFile(s.FS, fname, nil, 0644)
579557
c.Assert(err, IsNil)
580-
c.Assert(f.Close(), IsNil)
581558
}
582559

583560
c.Assert(RemoveAll(s.FS, "foo/bar/.."), IsNil)
@@ -592,6 +569,7 @@ func (s *FilesystemSuite) TestRemoveAllRelative(c *C) {
592569
func (s *FilesystemSuite) TestMkdirAll(c *C) {
593570
err := s.FS.MkdirAll("empty", os.FileMode(0755))
594571
c.Assert(err, IsNil)
572+
595573
fi, err := s.FS.Stat("empty")
596574
c.Assert(err, IsNil)
597575
c.Assert(fi.IsDir(), Equals, true)
@@ -600,6 +578,7 @@ func (s *FilesystemSuite) TestMkdirAll(c *C) {
600578
func (s *FilesystemSuite) TestMkdirAllNested(c *C) {
601579
err := s.FS.MkdirAll("foo/bar/baz", os.FileMode(0755))
602580
c.Assert(err, IsNil)
581+
603582
fi, err := s.FS.Stat("foo/bar/baz")
604583
c.Assert(err, IsNil)
605584
c.Assert(fi.IsDir(), Equals, true)
@@ -645,3 +624,15 @@ func (s *FilesystemSuite) TestMkdirAllWithExistingFile(c *C) {
645624
c.Assert(err, IsNil)
646625
c.Assert(fi.IsDir(), Equals, false)
647626
}
627+
628+
func (s *FilesystemSuite) TestWriteFile(c *C) {
629+
err := WriteFile(s.FS, "foo", []byte("bar"), 0777)
630+
c.Assert(err, IsNil)
631+
632+
f, err := s.FS.Open("foo")
633+
c.Assert(err, IsNil)
634+
635+
wrote, err := ioutil.ReadAll(f)
636+
c.Assert(err, IsNil)
637+
c.Assert(string(wrote), DeepEquals, "bar")
638+
}

0 commit comments

Comments
 (0)