Skip to content

Commit bb96577

Browse files
alessio-peruginialessio-perugini
committed
fix old test, after adding more test files
1 parent 0dccf70 commit bb96577

File tree

2 files changed

+133
-75
lines changed

2 files changed

+133
-75
lines changed

‎paths_test.go

+13-10
Original file line numberDiff line numberDiff line change
@@ -306,34 +306,37 @@ func TestFilterDirs(t *testing.T) {
306306

307307
list, err := testPath.ReadDir()
308308
require.NoError(t, err)
309-
require.Len(t, list, 6)
309+
require.Len(t, list, 7)
310310

311311
pathEqualsTo(t, "_testdata/anotherFile", list[0])
312312
pathEqualsTo(t, "_testdata/file", list[1])
313313
pathEqualsTo(t, "_testdata/folder", list[2])
314-
pathEqualsTo(t, "_testdata/symlinktofolder", list[3])
315-
pathEqualsTo(t, "_testdata/test.txt", list[4])
316-
pathEqualsTo(t, "_testdata/test.txt.gz", list[5])
314+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", list[3])
315+
pathEqualsTo(t, "_testdata/symlinktofolder", list[4])
316+
pathEqualsTo(t, "_testdata/test.txt", list[5])
317+
pathEqualsTo(t, "_testdata/test.txt.gz", list[6])
317318

318319
list.FilterDirs()
319-
require.Len(t, list, 2)
320+
require.Len(t, list, 3)
320321
pathEqualsTo(t, "_testdata/folder", list[0])
321-
pathEqualsTo(t, "_testdata/symlinktofolder", list[1])
322+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", list[1])
323+
pathEqualsTo(t, "_testdata/symlinktofolder", list[2])
322324
}
323325

324326
func TestFilterOutDirs(t *testing.T) {
325327
testPath := New("_testdata")
326328

327329
list, err := testPath.ReadDir()
328330
require.NoError(t, err)
329-
require.Len(t, list, 6)
331+
require.Len(t, list, 7)
330332

331333
pathEqualsTo(t, "_testdata/anotherFile", list[0])
332334
pathEqualsTo(t, "_testdata/file", list[1])
333335
pathEqualsTo(t, "_testdata/folder", list[2])
334-
pathEqualsTo(t, "_testdata/symlinktofolder", list[3])
335-
pathEqualsTo(t, "_testdata/test.txt", list[4])
336-
pathEqualsTo(t, "_testdata/test.txt.gz", list[5])
336+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", list[3])
337+
pathEqualsTo(t, "_testdata/symlinktofolder", list[4])
338+
pathEqualsTo(t, "_testdata/test.txt", list[5])
339+
pathEqualsTo(t, "_testdata/test.txt.gz", list[6])
337340

338341
list.FilterOutDirs()
339342
require.Len(t, list, 4)

‎readdir_test.go

+120-65
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestReadDirRecursive(t *testing.T) {
4242

4343
list, err := testPath.ReadDirRecursive()
4444
require.NoError(t, err)
45-
require.Len(t, list, 16)
45+
require.Len(t, list, 25)
4646

4747
pathEqualsTo(t, "_testdata/anotherFile", list[0])
4848
pathEqualsTo(t, "_testdata/file", list[1])
@@ -52,14 +52,25 @@ func TestReadDirRecursive(t *testing.T) {
5252
pathEqualsTo(t, "_testdata/folder/file3", list[5])
5353
pathEqualsTo(t, "_testdata/folder/subfolder", list[6])
5454
pathEqualsTo(t, "_testdata/folder/subfolder/file4", list[7])
55-
pathEqualsTo(t, "_testdata/symlinktofolder", list[8])
56-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", list[9])
57-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", list[10])
58-
pathEqualsTo(t, "_testdata/symlinktofolder/file3", list[11])
59-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", list[12])
60-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", list[13])
61-
pathEqualsTo(t, "_testdata/test.txt", list[14])
62-
pathEqualsTo(t, "_testdata/test.txt.gz", list[15])
55+
56+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", list[8])
57+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file", list[9])
58+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file2", list[10])
59+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", list[11])
60+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", list[12])
61+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file2", list[13])
62+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file3", list[14])
63+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder", list[15])
64+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder/file4", list[16])
65+
66+
pathEqualsTo(t, "_testdata/symlinktofolder", list[17])
67+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", list[18])
68+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", list[19])
69+
pathEqualsTo(t, "_testdata/symlinktofolder/file3", list[20])
70+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", list[21])
71+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", list[22])
72+
pathEqualsTo(t, "_testdata/test.txt", list[23])
73+
pathEqualsTo(t, "_testdata/test.txt.gz", list[24])
6374
}
6475

6576
func TestReadDirRecursiveSymLinkLoop(t *testing.T) {
@@ -110,7 +121,7 @@ func TestReadDirRecursiveFiltered(t *testing.T) {
110121
l, err := testdata.ReadDirRecursiveFiltered(nil)
111122
require.NoError(t, err)
112123
l.Sort()
113-
require.Len(t, l, 16)
124+
require.Len(t, l, 25)
114125
pathEqualsTo(t, "_testdata/anotherFile", l[0])
115126
pathEqualsTo(t, "_testdata/file", l[1])
116127
pathEqualsTo(t, "_testdata/folder", l[2])
@@ -119,42 +130,62 @@ func TestReadDirRecursiveFiltered(t *testing.T) {
119130
pathEqualsTo(t, "_testdata/folder/file3", l[5])
120131
pathEqualsTo(t, "_testdata/folder/subfolder", l[6])
121132
pathEqualsTo(t, "_testdata/folder/subfolder/file4", l[7])
122-
pathEqualsTo(t, "_testdata/symlinktofolder", l[8])
123-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[9])
124-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[10])
125-
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[11])
126-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[12])
127-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[13])
128-
pathEqualsTo(t, "_testdata/test.txt", l[14])
129-
pathEqualsTo(t, "_testdata/test.txt.gz", l[15])
133+
134+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[8])
135+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file", l[9])
136+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file2", l[10])
137+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", l[11])
138+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", l[12])
139+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file2", l[13])
140+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file3", l[14])
141+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder", l[15])
142+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder/file4", l[16])
143+
144+
pathEqualsTo(t, "_testdata/symlinktofolder", l[17])
145+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[18])
146+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[19])
147+
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[20])
148+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[21])
149+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[22])
150+
pathEqualsTo(t, "_testdata/test.txt", l[23])
151+
pathEqualsTo(t, "_testdata/test.txt.gz", l[24])
130152

131153
l, err = testdata.ReadDirRecursiveFiltered(FilterOutDirectories())
132154
require.NoError(t, err)
133155
l.Sort()
134-
require.Len(t, l, 6)
156+
require.Len(t, l, 7)
135157
pathEqualsTo(t, "_testdata/anotherFile", l[0])
136158
pathEqualsTo(t, "_testdata/file", l[1])
137-
pathEqualsTo(t, "_testdata/folder", l[2]) // <- this is listed but not traversed
138-
pathEqualsTo(t, "_testdata/symlinktofolder", l[3]) // <- this is listed but not traversed
139-
pathEqualsTo(t, "_testdata/test.txt", l[4])
140-
pathEqualsTo(t, "_testdata/test.txt.gz", l[5])
159+
pathEqualsTo(t, "_testdata/folder", l[2]) // <- this is listed but not traversed
160+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[3]) // <- this is listed but not traversed
161+
pathEqualsTo(t, "_testdata/symlinktofolder", l[4]) // <- this is listed but not traversed
162+
pathEqualsTo(t, "_testdata/test.txt", l[5])
163+
pathEqualsTo(t, "_testdata/test.txt.gz", l[6])
141164

142165
l, err = testdata.ReadDirRecursiveFiltered(nil, FilterOutDirectories())
143166
require.NoError(t, err)
144167
l.Sort()
145-
require.Len(t, l, 12)
168+
require.Len(t, l, 18)
146169
pathEqualsTo(t, "_testdata/anotherFile", l[0])
147170
pathEqualsTo(t, "_testdata/file", l[1])
148171
pathEqualsTo(t, "_testdata/folder/.hidden", l[2])
149172
pathEqualsTo(t, "_testdata/folder/file2", l[3])
150173
pathEqualsTo(t, "_testdata/folder/file3", l[4])
151174
pathEqualsTo(t, "_testdata/folder/subfolder/file4", l[5])
152-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[6])
153-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[7])
154-
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[8])
155-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[9])
156-
pathEqualsTo(t, "_testdata/test.txt", l[10])
157-
pathEqualsTo(t, "_testdata/test.txt.gz", l[11])
175+
176+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file", l[6])
177+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file2", l[7])
178+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", l[8])
179+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file2", l[9])
180+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file3", l[10])
181+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder/file4", l[11])
182+
183+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[12])
184+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[13])
185+
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[14])
186+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[15])
187+
pathEqualsTo(t, "_testdata/test.txt", l[16])
188+
pathEqualsTo(t, "_testdata/test.txt.gz", l[17])
158189

159190
l, err = testdata.ReadDirRecursiveFiltered(FilterOutDirectories(), FilterOutDirectories())
160191
require.NoError(t, err)
@@ -168,80 +199,104 @@ func TestReadDirRecursiveFiltered(t *testing.T) {
168199
l, err = testdata.ReadDirRecursiveFiltered(FilterOutPrefixes("sub"), FilterOutSuffixes("3"))
169200
require.NoError(t, err)
170201
l.Sort()
171-
require.Len(t, l, 12)
202+
require.Len(t, l, 19)
172203
pathEqualsTo(t, "_testdata/anotherFile", l[0])
173204
pathEqualsTo(t, "_testdata/file", l[1])
174205
pathEqualsTo(t, "_testdata/folder", l[2])
175206
pathEqualsTo(t, "_testdata/folder/.hidden", l[3])
176207
pathEqualsTo(t, "_testdata/folder/file2", l[4])
177208
pathEqualsTo(t, "_testdata/folder/subfolder", l[5]) // <- subfolder skipped by Prefix("sub")
178-
pathEqualsTo(t, "_testdata/symlinktofolder", l[6])
179-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[7])
180-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[8])
181-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[9]) // <- subfolder skipped by Prefix("sub")
182-
pathEqualsTo(t, "_testdata/test.txt", l[10])
183-
pathEqualsTo(t, "_testdata/test.txt.gz", l[11])
209+
210+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[6])
211+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file", l[7])
212+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/file2", l[8])
213+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", l[9])
214+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", l[10])
215+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/file2", l[11])
216+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder", l[12]) // <- subfolder skipped by Prefix("sub")
217+
218+
pathEqualsTo(t, "_testdata/symlinktofolder", l[13])
219+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[14])
220+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[15])
221+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[16]) // <- subfolder skipped by Prefix("sub")
222+
pathEqualsTo(t, "_testdata/test.txt", l[17])
223+
pathEqualsTo(t, "_testdata/test.txt.gz", l[18])
184224

185225
l, err = testdata.ReadDirRecursiveFiltered(FilterOutPrefixes("sub"), AndFilter(FilterOutSuffixes("3"), FilterOutPrefixes("fil")))
186226
require.NoError(t, err)
187227
l.Sort()
188-
require.Len(t, l, 9)
228+
require.Len(t, l, 13)
189229
pathEqualsTo(t, "_testdata/anotherFile", l[0])
190230
pathEqualsTo(t, "_testdata/folder", l[1])
191231
pathEqualsTo(t, "_testdata/folder/.hidden", l[2])
192232
pathEqualsTo(t, "_testdata/folder/subfolder", l[3])
193-
pathEqualsTo(t, "_testdata/symlinktofolder", l[4])
194-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[5])
195-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[6])
196-
pathEqualsTo(t, "_testdata/test.txt", l[7])
197-
pathEqualsTo(t, "_testdata/test.txt.gz", l[8])
233+
234+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[4])
235+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", l[5])
236+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", l[6])
237+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder", l[7])
238+
239+
pathEqualsTo(t, "_testdata/symlinktofolder", l[8])
240+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[9])
241+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[10])
242+
pathEqualsTo(t, "_testdata/test.txt", l[11])
243+
pathEqualsTo(t, "_testdata/test.txt.gz", l[12])
198244

199245
l, err = testdata.ReadDirRecursiveFiltered(FilterOutPrefixes("sub"), AndFilter(FilterOutSuffixes("3"), FilterOutPrefixes("fil"), FilterOutSuffixes(".gz")))
200246
require.NoError(t, err)
201247
l.Sort()
202-
require.Len(t, l, 8)
248+
require.Len(t, l, 12)
203249
pathEqualsTo(t, "_testdata/anotherFile", l[0])
204250
pathEqualsTo(t, "_testdata/folder", l[1])
205251
pathEqualsTo(t, "_testdata/folder/.hidden", l[2])
206252
pathEqualsTo(t, "_testdata/folder/subfolder", l[3])
207-
pathEqualsTo(t, "_testdata/symlinktofolder", l[4])
208-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[5])
209-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[6])
210-
pathEqualsTo(t, "_testdata/test.txt", l[7])
253+
254+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[4])
255+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", l[5])
256+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/.hidden", l[6])
257+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder/subfolder", l[7])
258+
259+
pathEqualsTo(t, "_testdata/symlinktofolder", l[8])
260+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[9])
261+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[10])
262+
pathEqualsTo(t, "_testdata/test.txt", l[11])
211263

212264
l, err = testdata.ReadDirRecursiveFiltered(OrFilter(FilterPrefixes("sub"), FilterSuffixes("tofolder")))
213265
require.NoError(t, err)
214266
l.Sort()
215-
require.Len(t, l, 11)
267+
require.Len(t, l, 12)
216268
pathEqualsTo(t, "_testdata/anotherFile", l[0])
217269
pathEqualsTo(t, "_testdata/file", l[1])
218270
pathEqualsTo(t, "_testdata/folder", l[2])
219-
pathEqualsTo(t, "_testdata/symlinktofolder", l[3])
220-
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[4])
221-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[5])
222-
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[6])
223-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[7])
224-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[8])
225-
pathEqualsTo(t, "_testdata/test.txt", l[9])
226-
pathEqualsTo(t, "_testdata/test.txt.gz", l[10])
271+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[3])
272+
pathEqualsTo(t, "_testdata/symlinktofolder", l[4])
273+
pathEqualsTo(t, "_testdata/symlinktofolder/.hidden", l[5])
274+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[6])
275+
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[7])
276+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[8])
277+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder/file4", l[9])
278+
pathEqualsTo(t, "_testdata/test.txt", l[10])
279+
pathEqualsTo(t, "_testdata/test.txt.gz", l[11])
227280

228281
l, err = testdata.ReadDirRecursiveFiltered(nil, FilterNames("folder"))
229282
require.NoError(t, err)
230283
l.Sort()
231-
require.Len(t, l, 1)
284+
require.Len(t, l, 2)
232285
pathEqualsTo(t, "_testdata/folder", l[0])
286+
pathEqualsTo(t, "_testdata/folder_containing_symlinks/folder", l[1])
233287

234288
l, err = testdata.ReadDirRecursiveFiltered(FilterNames("symlinktofolder"), FilterOutNames(".hidden"))
235289
require.NoError(t, err)
236-
require.Len(t, l, 9)
290+
require.Len(t, l, 10)
237291
l.Sort()
238292
pathEqualsTo(t, "_testdata/anotherFile", l[0])
239293
pathEqualsTo(t, "_testdata/file", l[1])
240294
pathEqualsTo(t, "_testdata/folder", l[2])
241-
pathEqualsTo(t, "_testdata/symlinktofolder", l[3])
242-
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[4])
243-
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[5])
244-
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[6])
245-
pathEqualsTo(t, "_testdata/test.txt", l[7])
246-
pathEqualsTo(t, "_testdata/test.txt.gz", l[8])
295+
pathEqualsTo(t, "_testdata/folder_containing_symlinks", l[3])
296+
pathEqualsTo(t, "_testdata/symlinktofolder", l[4])
297+
pathEqualsTo(t, "_testdata/symlinktofolder/file2", l[5])
298+
pathEqualsTo(t, "_testdata/symlinktofolder/file3", l[6])
299+
pathEqualsTo(t, "_testdata/symlinktofolder/subfolder", l[7])
300+
pathEqualsTo(t, "_testdata/test.txt", l[8])
301+
pathEqualsTo(t, "_testdata/test.txt.gz", l[9])
247302
}

0 commit comments

Comments
 (0)