Skip to content

Commit f993d9e

Browse files
committed
fix: go tests should skip modules tests without modules files
1 parent 29858cf commit f993d9e

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

pkg/go/transformer/module-to-model_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ func TestTransformModuleToJSON(t *testing.T) {
3131
t.Skip()
3232
}
3333

34+
if testCase.Modules == nil {
35+
return
36+
}
37+
3438
actual, err := transformer.TransformModuleFilesToModel(testCase.Modules, "1.2")
3539
if len(testCase.ExpectedErrors) == 0 {
3640
require.NoError(t, err)

pkg/go/transformer/testcases_test.go

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -281,27 +281,25 @@ func loadModuleTestCases() ([]moduleTestCase, error) { //nolint:cyclop,gocognit
281281

282282
moduleDirectory := filepath.Join(testDataPath, testCase.Name, "module")
283283

284-
moduleFiles, err := os.ReadDir(moduleDirectory)
285-
if err != nil {
286-
return nil, err //nolint:wrapcheck
287-
}
284+
if moduleFiles, err := os.ReadDir(moduleDirectory); err == nil {
285+
modules := []transformer.ModuleFile{}
288286

289-
modules := []transformer.ModuleFile{}
287+
for _, file := range moduleFiles {
288+
if file.IsDir() || !strings.HasSuffix(file.Name(), ".fga") {
289+
continue
290+
}
290291

291-
for _, file := range moduleFiles {
292-
if file.IsDir() || !strings.HasSuffix(file.Name(), ".fga") {
293-
continue
294-
}
292+
moduleFile, _ := os.ReadFile(filepath.Join(moduleDirectory, file.Name()))
295293

296-
moduleFile, _ := os.ReadFile(filepath.Join(moduleDirectory, file.Name()))
294+
modules = append(modules, transformer.ModuleFile{
295+
Name: file.Name(),
296+
Contents: string(moduleFile),
297+
})
298+
}
297299

298-
modules = append(modules, transformer.ModuleFile{
299-
Name: file.Name(),
300-
Contents: string(moduleFile),
301-
})
300+
testCase.Modules = modules
302301
}
303302

304-
testCase.Modules = modules
305303
testCases = append(testCases, testCase)
306304
}
307305

0 commit comments

Comments
 (0)