fix tests after path upgrade

kmulvey · Dec 7, 2022 · 47f4f4a · 47f4f4a
1 parent ef3d79a
commit 47f4f4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/internal/app/imagedup/files_test.go b/internal/app/imagedup/files_test.go
@@ -31,9 +31,8 @@ func TestStreamFiles(t *testing.T) {
 		close(done)
 	}()
 
-	files, err := path.ListFiles("./testimages")
+	files, err := path.List("./testimages", path.NewFileListFilter())
 	assert.NoError(t, err)
-	files = path.OnlyFiles(files)
 	var fileNames = path.OnlyNames(files)
 
 	id.streamFiles(context.Background(), fileNames)
@@ -65,9 +64,8 @@ func TestStreamFilesDedup(t *testing.T) {
 		close(done)
 	}()
 
-	files, err := path.ListFiles("./testimages")
+	files, err := path.List("./testimages", path.NewFileListFilter())
 	assert.NoError(t, err)
-	files = path.OnlyFiles(files)
 	var fileNames = path.OnlyNames(files)
 
 	id.streamFiles(context.Background(), fileNames)

diff --git a/internal/app/imagedup/hash/cache_test.go b/internal/app/imagedup/hash/cache_test.go
@@ -19,9 +19,9 @@ func TestCache(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, cache)
 
-	files, err := path.ListFiles("../testimages")
+	dirs, err := path.List("../testimages", path.NewFileListFilter())
 	assert.NoError(t, err)
-	var fileNames = path.OnlyNames(path.OnlyFiles(files))
+	var fileNames = path.OnlyNames(dirs)
 
 	for i, file := range fileNames {
 		_, err = cache.GetHash(i, file)
@@ -87,11 +87,11 @@ func BenchmarkGetHash(b *testing.B) {
 	var cache, err = NewCache(cacheFile, "glob", goutils.RandomString(5), 3)
 	assert.NoError(b, err)
 
-	files, err := path.ListFiles("../testimages")
+	dirs, err := path.List("../testimages", path.NewFileListFilter())
 	assert.NoError(b, err)
-	var fileNames = path.OnlyNames(path.OnlyFiles(files))
+	var fileNames = path.OnlyNames(dirs)
 
-	for i, file := range files {
+	for i, file := range dirs {
 		_, err = cache.GetHash(i, file.AbsolutePath)
 		assert.NoError(b, err)
 	}

diff --git a/internal/app/imagedup/main_test.go b/internal/app/imagedup/main_test.go
@@ -22,9 +22,9 @@ func TestNewImageDup(t *testing.T) {
 	dup, err = NewImageDup("TestNewImageDup", cacheFile, "glob", 2, 3, 10, true)
 	assert.NoError(t, err)
 
-	files, err := path.ListFiles("./testimages")
+	dirs, err := path.List("./testimages", path.NewFileListFilter())
 	assert.NoError(t, err)
-	var fileNames = path.OnlyNames(path.OnlyFiles(files))
+	var fileNames = path.OnlyNames(dirs)
 
 	var results, errors = dup.Run(context.Background(), fileNames)
 	var done = make(chan struct{})