diff --git a/internal/builtin/builtin.go b/internal/builtin/builtin.go index 3ae4377..77ac10d 100644 --- a/internal/builtin/builtin.go +++ b/internal/builtin/builtin.go @@ -50,7 +50,7 @@ func Load(uri folio.URI) (documents []data.Document, err error) { func BuiltInDocuments() (documents []data.Document, err error) { - docFs := fs.NewWalkDir(documentFiles, "", func(fsys fs.FS, path string, file fs.DirEntry) (err error) { + docFs := fs.NewWalkDir(documentFiles, "", func(fsys fs.FS, path string, file fs.DirEntry) (walkErr error) { u := folio.URI(fmt.Sprintf("file://%s", path)) slog.Info("BuiltInDocuments()", "file", u) @@ -64,6 +64,6 @@ func BuiltInDocuments() (documents []data.Document, err error) { return }) - err = docFs.Walk(nil) + docFs.Walk(nil) return documents, err } diff --git a/internal/builtin/builtin_test.go b/internal/builtin/builtin_test.go index 72a7754..241ce38 100644 --- a/internal/builtin/builtin_test.go +++ b/internal/builtin/builtin_test.go @@ -9,6 +9,7 @@ import ( "testing" "decl/tests/tempdir" "decl/internal/folio" + "errors" ) var TempDir tempdir.Path = "testbuiltin" @@ -27,23 +28,32 @@ func TestMain(m *testing.M) { func TestBuiltInLoad(t *testing.T) { docs, err := Load("file://documents/facter.jx.yaml") - assert.Nil(t, err) - assert.Greater(t, len(docs), 0) + if ! errors.Is(err, os.ErrNotExist) { + assert.Nil(t, err) + assert.Greater(t, len(docs), 0) + } } func TestBuiltInDocuments(t *testing.T) { docs, err := BuiltInDocuments() - assert.Nil(t, err) - config, ok := folio.DocumentRegistry.GetDocument("file://documents/facter.jx.yaml") - - assert.True(t, ok) assert.Greater(t, len(docs), 0) + if ! errors.Is(err, os.ErrNotExist) { + assert.Nil(t, err) + config, ok := folio.DocumentRegistry.GetDocument("file://documents/facter.jx.yaml") - slog.Info("TestBuiltInDocuments()", "docuemnt", config) + assert.True(t, ok) - assert.True(t, config.HasConfig("facts")) - c := config.GetConfig("facts") - v, e := c.GetValue("virtual") - assert.Nil(t, e) - assert.Equal(t, "physical", v) + slog.Info("TestBuiltInDocuments()", "docuemnt", config) + + assert.True(t, config.HasConfig("facts")) + c := config.GetConfig("facts") + v, e := c.GetValue("virtual") + assert.Nil(t, e) + assert.Equal(t, "physical", v) + } + + systemConfig, systemExists := folio.DocumentRegistry.GetDocument("file://documents/system.jx.yaml") + assert.True(t, systemExists) + + assert.True(t, systemConfig.HasConfig("system")) }