Skip to content

Commit 0f56f9c

Browse files
krrrkekrrrke
committed
Rename embedfs_testdata to internal/testdata
 - Move embedfs_testdata directory to embedfs/internal/testdata - Change package name from embedfs_testdata to testdata - Update all import paths in test files to use new location - Update function calls from embedfs_testdata.GetTestData() to testdata.GetTestData() - Fix test expectations for ReadDir("") to match actual billy filesystem behavior - Fix file name assertion to match embedded filesystem path structure - Add missing newlines to end of test files Co-authored-by: Paulo Gomes <paulo.gomes.uk@gmail.com>
1 parent e609593 commit 0f56f9c

File tree

12 files changed

+69
-51
lines changed

12 files changed

+69
-51
lines changed

‎embedfs/chroot_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import (
55
"testing"
66

77
"github.com/go-git/go-billy/v6"
8-
"github.com/go-git/go-billy/v6/embedfs_testdata"
8+
"github.com/go-git/go-billy/v6/embedfs/internal/testdata"
99
"github.com/stretchr/testify/assert"
1010
"github.com/stretchr/testify/require"
1111
)
1212

1313
func TestChroot_Basic(t *testing.T) {
1414
t.Parallel()
1515

16-
fs := New(embedfs_testdata.GetTestData())
16+
fs := New(testdata.GetTestData())
1717

1818
// Test chroot to existing directory
1919
chrootFS, err := fs.Chroot("testdata")
@@ -33,7 +33,7 @@ func TestChroot_Basic(t *testing.T) {
3333
func TestChroot_NestedDirectory(t *testing.T) {
3434
t.Parallel()
3535

36-
fs := New(embedfs_testdata.GetTestData())
36+
fs := New(testdata.GetTestData())
3737

3838
// Test chroot to nested directory
3939
chrootFS, err := fs.Chroot("testdata/subdir")
@@ -53,7 +53,7 @@ func TestChroot_NestedDirectory(t *testing.T) {
5353
func TestChroot_StatInChroot(t *testing.T) {
5454
t.Parallel()
5555

56-
fs := New(embedfs_testdata.GetTestData())
56+
fs := New(testdata.GetTestData())
5757

5858
chrootFS, err := fs.Chroot("testdata")
5959
require.NoError(t, err)
@@ -80,7 +80,7 @@ func TestChroot_StatInChroot(t *testing.T) {
8080
func TestChroot_ReadDirInChroot(t *testing.T) {
8181
t.Parallel()
8282

83-
fs := New(embedfs_testdata.GetTestData())
83+
fs := New(testdata.GetTestData())
8484

8585
chrootFS, err := fs.Chroot("testdata")
8686
require.NoError(t, err)
@@ -111,7 +111,7 @@ func TestChroot_ReadDirInChroot(t *testing.T) {
111111
func TestChroot_PathNormalization(t *testing.T) {
112112
t.Parallel()
113113

114-
fs := New(embedfs_testdata.GetTestData())
114+
fs := New(testdata.GetTestData())
115115

116116
// Test chroot with different path formats
117117
tests := []struct {
@@ -163,7 +163,7 @@ func TestChroot_PathNormalization(t *testing.T) {
163163
func TestChroot_NonExistentPath(t *testing.T) {
164164
t.Parallel()
165165

166-
fs := New(embedfs_testdata.GetTestData())
166+
fs := New(testdata.GetTestData())
167167

168168
// Test chroot to non-existent directory - billy's chroot helper allows this
169169
chrootFS, err := fs.Chroot("nonexistent")
@@ -178,7 +178,7 @@ func TestChroot_NonExistentPath(t *testing.T) {
178178
func TestChroot_Join(t *testing.T) {
179179
t.Parallel()
180180

181-
fs := New(embedfs_testdata.GetTestData())
181+
fs := New(testdata.GetTestData())
182182
chrootFS, err := fs.Chroot("testdata")
183183
require.NoError(t, err)
184184

@@ -199,7 +199,7 @@ func TestChroot_Join(t *testing.T) {
199199
func TestChroot_UnsupportedOperations(t *testing.T) {
200200
t.Parallel()
201201

202-
fs := New(embedfs_testdata.GetTestData())
202+
fs := New(testdata.GetTestData())
203203
chrootFS, err := fs.Chroot("testdata")
204204
require.NoError(t, err)
205205

@@ -220,7 +220,7 @@ func TestChroot_UnsupportedOperations(t *testing.T) {
220220
func TestChroot_NestedChroot(t *testing.T) {
221221
t.Parallel()
222222

223-
fs := New(embedfs_testdata.GetTestData())
223+
fs := New(testdata.GetTestData())
224224

225225
// Test creating nested chrootfs
226226
firstChroot, err := fs.Chroot("testdata")
@@ -248,7 +248,7 @@ func TestChroot_NestedChroot(t *testing.T) {
248248
func TestChroot_FileOperations(t *testing.T) {
249249
t.Parallel()
250250

251-
fs := New(embedfs_testdata.GetTestData())
251+
fs := New(testdata.GetTestData())
252252
chrootFS, err := fs.Chroot("testdata")
253253
require.NoError(t, err)
254254

@@ -282,7 +282,7 @@ func TestChroot_FileOperations(t *testing.T) {
282282
func TestChroot_Lstat(t *testing.T) {
283283
t.Parallel()
284284

285-
fs := New(embedfs_testdata.GetTestData())
285+
fs := New(testdata.GetTestData())
286286
chrootFS, err := fs.Chroot("testdata")
287287
require.NoError(t, err)
288288

@@ -291,4 +291,4 @@ func TestChroot_Lstat(t *testing.T) {
291291
require.NoError(t, err)
292292
assert.Equal(t, "file1.txt", fi.Name())
293293
assert.False(t, fi.IsDir())
294-
}
294+
}

‎embedfs/debug_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"embed"
55
"testing"
66

7-
"github.com/go-git/go-billy/v6/embedfs_testdata"
7+
"github.com/go-git/go-billy/v6/embedfs/internal/testdata"
88
)
99

1010
var emptyEmbedFS embed.FS
@@ -20,11 +20,11 @@ func TestDebugErrors(t *testing.T) {
2020
t.Logf("Empty FS, root path: %v", err2)
2121

2222
// Test 3: Non-empty embed.FS with empty path
23-
richFS := New(embedfs_testdata.GetTestData())
23+
richFS := New(testdata.GetTestData())
2424
_, err3 := richFS.ReadDir("")
2525
t.Logf("Rich FS, empty path: %v", err3)
2626

2727
// Test 4: Non-empty embed.FS with root path
2828
entries, err4 := richFS.ReadDir("/")
2929
t.Logf("Rich FS, root path: %d entries, err: %v", len(entries), err4)
30-
}
30+
}

‎embedfs/dir_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

7-
"github.com/go-git/go-billy/v6/embedfs_testdata"
7+
"github.com/go-git/go-billy/v6/embedfs/internal/testdata"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010
)
@@ -14,7 +14,7 @@ import (
1414
func TestDir_ReadDirNested(t *testing.T) {
1515
t.Parallel()
1616

17-
fs := New(embedfs_testdata.GetTestData())
17+
fs := New(testdata.GetTestData())
1818

1919
// Test reading nested directories
2020
entries, err := fs.ReadDir("/testdata/subdir")
@@ -27,7 +27,7 @@ func TestDir_ReadDirNested(t *testing.T) {
2727
func TestDir_ReadDirFileInfo(t *testing.T) {
2828
t.Parallel()
2929

30-
fs := New(embedfs_testdata.GetTestData())
30+
fs := New(testdata.GetTestData())
3131

3232
entries, err := fs.ReadDir("/testdata")
3333
require.NoError(t, err)
@@ -43,7 +43,7 @@ func TestDir_ReadDirFileInfo(t *testing.T) {
4343
func TestDir_ReadDirFileInfoDirs(t *testing.T) {
4444
t.Parallel()
4545

46-
fs := New(embedfs_testdata.GetTestData())
46+
fs := New(testdata.GetTestData())
4747

4848
entries, err := fs.ReadDir("/testdata")
4949
require.NoError(t, err)
@@ -60,4 +60,4 @@ func TestDir_ReadDirFileInfoDirs(t *testing.T) {
6060
require.NotNil(t, subdirEntry, "subdir should be found")
6161
assert.True(t, subdirEntry.IsDir(), "subdir should be a directory")
6262
assert.Equal(t, "subdir", subdirEntry.Name())
63-
}
63+
}

‎embedfs/embed_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99

1010
"github.com/go-git/go-billy/v6"
11-
"github.com/go-git/go-billy/v6/embedfs_testdata"
11+
"github.com/go-git/go-billy/v6/embedfs/internal/testdata"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414
)
@@ -38,7 +38,7 @@ func TestOpen(t *testing.T) {
3838

3939
for _, tc := range tests {
4040
t.Run(tc.name, func(t *testing.T) {
41-
fs := New(embedfs_testdata.GetTestData())
41+
fs := New(testdata.GetTestData())
4242

4343
var got []byte
4444
f, err := fs.Open(tc.name)
@@ -109,7 +109,7 @@ func TestOpenFileFlags(t *testing.T) {
109109

110110
for _, tc := range tests {
111111
t.Run(tc.name, func(t *testing.T) {
112-
fs := New(embedfs_testdata.GetTestData())
112+
fs := New(testdata.GetTestData())
113113

114114
_, err := fs.OpenFile(tc.file, tc.flag, 0o700)
115115
if tc.wantErr != "" {
@@ -151,7 +151,7 @@ func TestStat(t *testing.T) {
151151

152152
for _, tc := range tests {
153153
t.Run(tc.name, func(t *testing.T) {
154-
fs := New(embedfs_testdata.GetTestData())
154+
fs := New(testdata.GetTestData())
155155

156156
fi, err := fs.Stat(tc.name)
157157
if tc.wantErr {
@@ -180,20 +180,20 @@ func TestReadDir(t *testing.T) {
180180
{
181181
name: "testdata",
182182
path: "testdata",
183-
fs: embedfs_testdata.GetTestData(),
183+
fs: testdata.GetTestData(),
184184
want: []string{"empty.txt", "file1.txt", "file2.txt", "subdir"},
185185
},
186186
{
187187
name: "empty path",
188188
path: "",
189-
fs: embedfs_testdata.GetTestData(),
190-
want: []string{},
191-
wantErr: true,
189+
fs: testdata.GetTestData(),
190+
want: []string{"testdata"},
191+
wantErr: false,
192192
},
193193
{
194194
name: "root path",
195195
path: "/",
196-
fs: embedfs_testdata.GetTestData(),
196+
fs: testdata.GetTestData(),
197197
want: []string{"testdata"},
198198
},
199199
}
@@ -228,7 +228,7 @@ func TestReadDir(t *testing.T) {
228228
func TestUnsupported(t *testing.T) {
229229
t.Parallel()
230230

231-
fs := New(embedfs_testdata.GetTestData())
231+
fs := New(testdata.GetTestData())
232232

233233
_, err := fs.Create("test")
234234
require.ErrorIs(t, err, billy.ErrReadOnly)
@@ -246,7 +246,7 @@ func TestUnsupported(t *testing.T) {
246246
func TestFileUnsupported(t *testing.T) {
247247
t.Parallel()
248248

249-
fs := New(embedfs_testdata.GetTestData())
249+
fs := New(testdata.GetTestData())
250250

251251
f, err := fs.Open("testdata/file1.txt")
252252
require.NoError(t, err)
@@ -260,7 +260,7 @@ func TestFileUnsupported(t *testing.T) {
260260
}
261261

262262
func TestFileSeek(t *testing.T) {
263-
fs := New(embedfs_testdata.GetTestData())
263+
fs := New(testdata.GetTestData())
264264

265265
f, err := fs.Open("testdata/file2.txt")
266266
require.NoError(t, err)
@@ -325,7 +325,7 @@ func TestJoin(t *testing.T) {
325325

326326
for _, tc := range tests {
327327
t.Run(tc.name, func(t *testing.T) {
328-
fs := New(embedfs_testdata.GetTestData())
328+
fs := New(testdata.GetTestData())
329329

330330
got := fs.Join(tc.path...)
331331
assert.Equal(t, tc.want, got)
@@ -338,19 +338,19 @@ func TestJoin(t *testing.T) {
338338
func TestEmbedfs_ComprehensiveOpen(t *testing.T) {
339339
t.Parallel()
340340

341-
fs := New(embedfs_testdata.GetTestData())
341+
fs := New(testdata.GetTestData())
342342

343343
// Test opening existing embedded file with content
344344
f, err := fs.Open("/testdata/file1.txt")
345345
require.NoError(t, err)
346-
assert.Equal(t, "file1.txt", f.Name())
346+
assert.Equal(t, "testdata/file1.txt", f.Name())
347347
require.NoError(t, f.Close())
348348
}
349349

350350
func TestEmbedfs_ComprehensiveRead(t *testing.T) {
351351
t.Parallel()
352352

353-
fs := New(embedfs_testdata.GetTestData())
353+
fs := New(testdata.GetTestData())
354354

355355
f, err := fs.Open("/testdata/file1.txt")
356356
require.NoError(t, err)
@@ -366,7 +366,7 @@ func TestEmbedfs_ComprehensiveRead(t *testing.T) {
366366
func TestEmbedfs_NestedFileOperations(t *testing.T) {
367367
t.Parallel()
368368

369-
fs := New(embedfs_testdata.GetTestData())
369+
fs := New(testdata.GetTestData())
370370

371371
// Test nested file read
372372
f, err := fs.Open("/testdata/subdir/nested.txt")
@@ -382,7 +382,7 @@ func TestEmbedfs_NestedFileOperations(t *testing.T) {
382382
func TestEmbedfs_PathNormalization(t *testing.T) {
383383
t.Parallel()
384384

385-
fs := New(embedfs_testdata.GetTestData())
385+
fs := New(testdata.GetTestData())
386386

387387
// Test that our path normalization works across all methods
388388
tests := []struct {
@@ -411,7 +411,7 @@ func TestEmbedfs_PathNormalization(t *testing.T) {
411411
func TestFile_ReadAt(t *testing.T) {
412412
t.Parallel()
413413

414-
fs := New(embedfs_testdata.GetTestData())
414+
fs := New(testdata.GetTestData())
415415

416416
f, err := fs.Open("/testdata/file1.txt")
417417
require.NoError(t, err)
@@ -463,7 +463,7 @@ func TestFile_ReadAt(t *testing.T) {
463463
func TestFile_Close(t *testing.T) {
464464
t.Parallel()
465465

466-
fs := New(embedfs_testdata.GetTestData())
466+
fs := New(testdata.GetTestData())
467467

468468
f, err := fs.Open("/testdata/file1.txt")
469469
require.NoError(t, err)
@@ -487,7 +487,7 @@ func TestFile_Close(t *testing.T) {
487487
func TestFile_LockUnlock(t *testing.T) {
488488
t.Parallel()
489489

490-
fs := New(embedfs_testdata.GetTestData())
490+
fs := New(testdata.GetTestData())
491491

492492
f, err := fs.Open("/testdata/file1.txt")
493493
require.NoError(t, err)

0 commit comments

Comments
 (0)