Fix file/dir mode helpers and tests

assert_test.go

@@ -14,5 +14,5 @@ func (it *internalTest) Errorf(s string, args ...any) {
 	}
 	msg := strings.TrimSpace(fmt.Sprintf(s, args...))
 	it.capture = msg
-	fmt.Println(msg)
+	it.t.Log(msg)
 }

internal/assertions/assertions.go

@@ -1115,6 +1115,25 @@ func DirNotExistsFS(system fs.FS, directory string) (s string) {
 	return
 }
 
+func FileMode(path string, permissions fs.FileMode) (s string) {
+	info, err := os.Stat(path)
+	if err != nil {
+		s = "expected to stat path\n"
+		s += bullet(" name: %s\n", path)
+		s += bullet("error: %s\n", err)
+		return
+	}
+
+	mode := info.Mode()
+	if permissions != mode {
+		s = "expected different file permissions\n"
+		s += bullet("name: %s\n", path)
+		s += bullet(" exp: %s\n", permissions)
+		s += bullet(" got: %s\n", mode)
+	}
+	return
+}
+
 func FileModeFS(system fs.FS, path string, permissions fs.FileMode) (s string) {
 	info, err := fs.Stat(system, path)
 	if err != nil {
@@ -1134,6 +1153,29 @@ func FileModeFS(system fs.FS, path string, permissions fs.FileMode) (s string) {
 	return
 }
 
+func DirMode(path string, permissions fs.FileMode) (s string) {
+	info, err := os.Stat(path)
+	if err != nil {
+		s = "expected to stat path\n"
+		s += bullet(" name: %s\n", path)
+		s += bullet("error: %s\n", err)
+		return
+	}
+	if !info.IsDir() {
+		s = "expected to stat a directory\n"
+		s += bullet("name: %s\n", path)
+		return
+	}
+	mode := info.Mode()
+	if permissions != mode {
+		s = "expected different file permissions\n"
+		s += bullet("name: %s\n", path)
+		s += bullet(" exp: %s\n", permissions)
+		s += bullet(" got: %s\n", mode)
+	}
+	return
+}
+
 func DirModeFS(system fs.FS, path string, permissions fs.FileMode) (s string) {
 	info, err := fs.Stat(system, path)
 	if err != nil {

must/assert_test.go

@@ -14,5 +14,5 @@ func (it *internalTest) Fatalf(s string, args ...any) {
 	}
 	msg := strings.TrimSpace(fmt.Sprintf(s, args...))
 	it.capture = msg
-	fmt.Println(msg)
+	it.t.Log(msg)
 }

test.go

@@ -6,13 +6,11 @@ package test
 import (
 	"io"
 	"io/fs"
-	"os"
 	"regexp"
 	"strings"
 
 	"github.com/shoenig/test/interfaces"
 	"github.com/shoenig/test/internal/assertions"
-	"github.com/shoenig/test/internal/brokenfs"
 	"github.com/shoenig/test/internal/constraints"
 	"github.com/shoenig/test/internal/util"
 	"github.com/shoenig/test/wait"
@@ -607,8 +605,7 @@ func FileModeFS(t T, system fs.FS, path string, permissions fs.FileMode, setting
 // FileMode asserts the file or directory at path on the OS filesystem has exactly the given permission bits.
 func FileMode(t T, path string, permissions fs.FileMode, settings ...Setting) {
 	t.Helper()
-	path = strings.TrimPrefix(path, "/")
-	invoke(t, assertions.FileModeFS(os.DirFS(brokenfs.Root), path, permissions), settings...)
+	invoke(t, assertions.FileMode(path, permissions), settings...)
 }
 
 // DirModeFS asserts the directory at path on fs.FS has exactly the given permission bits.
@@ -623,8 +620,7 @@ func DirModeFS(t T, system fs.FS, path string, permissions fs.FileMode, settings
 // DirMode asserts the directory at path on the OS filesystem has exactly the given permission bits.
 func DirMode(t T, path string, permissions fs.FileMode, settings ...Setting) {
 	t.Helper()
-	path = strings.TrimPrefix(path, "/")
-	invoke(t, assertions.DirModeFS(os.DirFS(brokenfs.Root), path, permissions), settings...)
+	invoke(t, assertions.DirMode(path, permissions), settings...)
 }
 
 // FileContainsFS asserts the file on fs.FS contains content as a substring.