Skip to content

Commit f52d710

Browse files
authored
unit tests: rename ./tests, ./test_data -> ./testdata (#3673)
* unit tests: rename ./tests, ./test_data -> ./testdata * same for exprlib * same for cticlient
1 parent 7c6651b commit f52d710

File tree

129 files changed

+19
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+19
-21
lines changed

pkg/cticlient/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ func fireHandler(req *http.Request) *http.Response {
5151

5252
//unmarshal data
5353
if fireResponses == nil {
54-
page1, err := os.ReadFile("tests/fire-page1.json")
54+
page1, err := os.ReadFile("testdata/fire-page1.json")
5555
if err != nil {
5656
panic("can't read file")
5757
}
5858

59-
page2, err := os.ReadFile("tests/fire-page2.json")
59+
page2, err := os.ReadFile("testdata/fire-page2.json")
6060
if err != nil {
6161
panic("can't read file")
6262
}
File renamed without changes.
File renamed without changes.

pkg/exprhelpers/exprlib_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"github.com/crowdsecurity/crowdsec/pkg/types"
2121
)
2222

23-
const TestFolder = "tests"
24-
2523
func getDBClient(t *testing.T) *database.Client {
2624
t.Helper()
2725

@@ -272,7 +270,7 @@ func TestRegexpCacheBehavior(t *testing.T) {
272270
require.NoError(t, err)
273271

274272
filename := "test_data_re.txt"
275-
err = FileInit(TestFolder, filename, "regex")
273+
err = FileInit("testdata", filename, "regex")
276274
require.NoError(t, err)
277275

278276
// cache with no TTL
@@ -305,7 +303,7 @@ func TestRegexpInFile(t *testing.T) {
305303
t.Fatal(err)
306304
}
307305

308-
err := FileInit(TestFolder, "test_data_re.txt", "regex")
306+
err := FileInit("testdata", "test_data_re.txt", "regex")
309307
if err != nil {
310308
t.Fatal(err)
311309
}
@@ -397,7 +395,7 @@ func TestFileInit(t *testing.T) {
397395
}
398396

399397
for _, test := range tests {
400-
err := FileInit(TestFolder, test.filename, test.types)
398+
err := FileInit("testdata", test.filename, test.types)
401399
if err != nil {
402400
t.Fatal(err)
403401
}
@@ -438,7 +436,7 @@ func TestFile(t *testing.T) {
438436
t.Fatal(err)
439437
}
440438

441-
err := FileInit(TestFolder, "test_data.txt", "string")
439+
err := FileInit("testdata", "test_data.txt", "string")
442440
if err != nil {
443441
t.Fatal(err)
444442
}

pkg/exprhelpers/jsonextract_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestJsonExtract(t *testing.T) {
1313
t.Fatal(err)
1414
}
1515

16-
err := FileInit(TestFolder, "test_data_re.txt", "regex")
16+
err := FileInit("testdata", "test_data_re.txt", "regex")
1717
if err != nil {
1818
t.Fatal(err)
1919
}
@@ -68,7 +68,7 @@ func TestJsonExtractUnescape(t *testing.T) {
6868
t.Fatal(err)
6969
}
7070

71-
err := FileInit(TestFolder, "test_data_re.txt", "regex")
71+
err := FileInit("testdata", "test_data_re.txt", "regex")
7272
if err != nil {
7373
t.Fatal(err)
7474
}
@@ -116,7 +116,7 @@ func TestJsonExtractSlice(t *testing.T) {
116116
t.Fatal(err)
117117
}
118118

119-
err := FileInit(TestFolder, "test_data_re.txt", "regex")
119+
err := FileInit("testdata", "test_data_re.txt", "regex")
120120
if err != nil {
121121
t.Fatal(err)
122122
}
@@ -178,7 +178,7 @@ func TestJsonExtractObject(t *testing.T) {
178178
t.Fatal(err)
179179
}
180180

181-
err := FileInit(TestFolder, "test_data_re.txt", "regex")
181+
err := FileInit("testdata", "test_data_re.txt", "regex")
182182
if err != nil {
183183
t.Fatal(err)
184184
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

pkg/leakybucket/buckets_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestBucket(t *testing.T) {
3838
tomb = &tomb.Tomb{}
3939
)
4040

41-
testdata := "./tests"
41+
testdata := "./testdata"
4242

4343
hubCfg := &csconfig.LocalHubCfg{
4444
HubDir: filepath.Join(testdata, "hub"),

0 commit comments

Comments
 (0)