From: Shawn Smith <shawn.p.smith@gmail.com>
Date: Wed, 1 Jan 2014 05:40:52 +0000 (+1100)
Subject: os: improve Readdir and Readdirnames test coverage
X-Git-Tag: go1.3beta1~1077
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c7d2e6af9aced200842b2afa2e9413e5a33e43a;p=gostls13.git

os: improve Readdir and Readdirnames test coverage

R=golang-codereviews, dave
CC=golang-codereviews
https://golang.org/cl/46450043
---

diff --git a/src/pkg/os/os_test.go b/src/pkg/os/os_test.go
index 414e4e6243..14ecd95875 100644
--- a/src/pkg/os/os_test.go
+++ b/src/pkg/os/os_test.go
@@ -252,11 +252,25 @@ func TestReaddirnames(t *testing.T) {
 	testReaddirnames(sysdir.name, sysdir.files, t)
 }
 
+func TestReaddirnamesNilFile(t *testing.T) {
+	var f *File
+	if fi, err := f.Readdirnames(1); fi != nil || err != ErrInvalid {
+		t.Errorf("Readdirnames should fail when f is nil: %v, %v", fi, err)
+	}
+}
+
 func TestReaddir(t *testing.T) {
 	testReaddir(".", dot, t)
 	testReaddir(sysdir.name, sysdir.files, t)
 }
 
+func TestReaddirNilFile(t *testing.T) {
+	var f *File
+	if fi, err := f.Readdir(1); fi != nil || err != ErrInvalid {
+		t.Errorf("Readdir should fail when f is nil: %v, %v", fi, err)
+	}
+}
+
 // Read the directory one entry at a time.
 func smallReaddirnames(file *File, length int, t *testing.T) []string {
 	names := make([]string, length)