test: improve test coverage (#114)

.github/workflows/ci-workflow.yml

@@ -1,4 +1,5 @@
 name: Traverse Continuous Integration
+
 on:
   push:
 
@@ -25,25 +26,50 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
 
+    env:
+      COVER_DIR: ${{ github.workspace }}/coverage
+      COVER_FILE: coverage.out
+      COVER_OUT_PATH: ${{ github.workspace }}/coverage/coverage.out
+      COVER_HTML_PATH: ${{ github.workspace }}/coverage/coverage.html
+      GINKGO_REPORT: ginkgo.report
+
     steps:
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 
       - name: Install goveralls
         run: go install github.com/mattn/goveralls@latest
 
+      - name: Install ginkgo
+        run: go install github.com/onsi/ginkgo/v2/[email protected]
+
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - run: go test -v -coverprofile=coverage.out ./...
+      - name: Ensure coverage directory exists
+        run: |
+          mkdir -p ${{ github.workspace }}/coverage
+      
+      - name: Run tests and generate coverage profile with Ginkgo
+        run: |
+          ginkgo run -r -json-report {{env.GINKGO_REPORT}} -coverpkg=./... -coverprofile=coverage.out
 
-      - uses: shogo82148/actions-goveralls@v1
+      - name: Apply coverage exclusions
+        run: |
+          ${{ github.workspace }}/scripts/apply-coverage-exclusions.sh
+      
+      - name: Check coverage directory contents
+        run: |
+          echo "Contents of ${{ github.workspace }}/coverage:"
+          ls -la ${{ github.workspace }}/coverage
+
+      - name: Generate HTML coverage report
+        run: |
+          go tool cover -html=coverage.out -o ${{ github.workspace }}/coverage/coverage.html
+
+      - name: Upload coverage to Coveralls
+        uses: shogo82148/actions-goveralls@v1
         with:
           path-to-profile: coverage.out
-
-      - name: Send coverage
-        env:
-          COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: goveralls -coverprofile=coverage.out -service=github

.gitignore

@@ -18,6 +18,8 @@
 coverage
 coverage.out
 ginkgo.report
+report.json
+coverage.html
 
 .task/
 

.vscode/settings.json

@@ -87,6 +87,7 @@
     "respoofed",
     "rsys",
     "samber",
+    "samp",
     "shogo",
     "sidewalk",
     "snivilisation",

Taskfile.yml

@@ -26,6 +26,10 @@ vars:
   ACTIVE_US: "{{.BINARY_NAME}}.active.en-US.{{.FORMAT}}"
   TRANSLATE_US: "{{.BINARY_NAME}}.translate.en-US.{{.FORMAT}}"
   TRANSLATE_US_FILEPATH: "{{.US_OUT_DIR}}/{{.TRANSLATE_US}}"
+  COVER_DIR: "./"
+  COVER_FILE: "coverage.out"
+  COVER_HTML_PATH: "./coverage.html"
+  GINKGO_REPORT: "ginkgo.report"
 
 tasks:
   # === build ================================================
@@ -88,6 +92,10 @@ tasks:
     cmds:
       - go test ./internal/feat/hiber
 
+  tf-samp:
+    cmds:
+      - go test ./internal/feat/sampling
+
   toc:
     cmds:
       - go test ./collections
@@ -172,44 +180,37 @@ tasks:
 
   # === coverage =============================================
 
-  publish-cover:
+  cover-clean:
+    cmds:
+      - rm -rf ./coverage
+
+  cover-publish:
     cmds:
       - goveralls -repotoken {{.COVERALLS_TOKEN}}
 
-  cover:
+  cover-setup:
     cmds:
       - mkdir -p ./coverage
-      - mkdir -p ./collections/coverage
-      - mkdir -p ./core/coverage/
-      - mkdir -p ./cycle/coverage
-      - mkdir -p ./enums/coverage
-      - mkdir -p ./internal/feat/filter/coverage
-      - mkdir -p ./internal/feat/hiber/coverage
-      - mkdir -p ./internal/feat/resume/coverage
-      - mkdir -p ./internal/feat/sampling/coverage
-      - mkdir -p ./internal/filtering/coverage
-      - mkdir -p ./internal/kernel/coverage
-      - mkdir -p ./internal/level/coverage
-      - mkdir -p ./internal/measure/coverage
-      - mkdir -p ./internal/services/coverage
-      - mkdir -p ./internal/level/coverage
-      - mkdir -p ./internal/third/bus/coverage
-      - mkdir -p ./internal/third/lo/coverage
-      - mkdir -p ./internal/types/coverage
-      - mkdir -p ./locale/coverage
-      - mkdir -p ./nfs/coverage
-      - mkdir -p ./pref/coverage
-      - mkdir -p ./tapable/coverage
-      - ginkgo --json-report
-        ./ginkgo.report
-        -coverpkg=./...
-        -coverprofile=./coverage/coverage.out -r
-      - go tool cover -html=./coverage/coverage.out -o ./coverage/coverage.html
-      - open ./coverage/coverage.html
-
-    view-cover:
-      cmds:
-        - open ./coverage/coverage.html
+
+  cover-ginkgo:
+    cmds:
+      - ginkgo run -r -json-report {{.GINKGO_REPORT}} -coverpkg=./... -coverprofile={{.COVER_FILE}} --output-dir {{.COVER_DIR}}
+
+  cover-show:
+    cmds:
+      - open {{.COVER_HTML_PATH}}
+
+  cover-exclude:
+    cmds:
+      - ./scripts/apply-coverage-exclusions.sh
+
+  cover:
+    cmds:
+      - task: cover-setup
+      - task: cover-ginkgo
+      - task: cover-exclude
+      - go tool cover -html=./coverage.out -o {{.COVER_HTML_PATH}}
+      - open {{.COVER_HTML_PATH}}
 
   # === i18n =================================================
 

builders.go

@@ -41,14 +41,13 @@ func (bs *Builders) buildAll() (*buildArtefacts, error) {
 	if optionsErr != nil {
 		return &buildArtefacts{
 			o:   o,
-			kc:  kernel.HadesNav(optionsErr),
+			kc:  kernel.HadesNav(o, optionsErr),
 			ext: ext,
 		}, optionsErr
 	}
 
 	// BUILD NAVIGATOR
 	//
-
 	artefacts, navErr := bs.navigator.Build(o, &types.Resources{
 		FS: FileSystems{
 			N: ext.navFS(),
@@ -61,7 +60,7 @@ func (bs *Builders) buildAll() (*buildArtefacts, error) {
 	if navErr != nil {
 		return &buildArtefacts{
 			o:   o,
-			kc:  kernel.HadesNav(navErr),
+			kc:  kernel.HadesNav(o, navErr),
 			ext: ext,
 		}, navErr
 	}
@@ -78,7 +77,7 @@ func (bs *Builders) buildAll() (*buildArtefacts, error) {
 	if pluginsErr != nil {
 		return &buildArtefacts{
 			o:   o,
-			kc:  kernel.HadesNav(pluginsErr),
+			kc:  kernel.HadesNav(o, pluginsErr),
 			ext: ext,
 		}, pluginsErr
 	}

collections/positional-set_test.go

@@ -190,4 +190,24 @@ var _ = Describe("PositionalSet", func() {
 			})
 		})
 	})
+
+	Context("Contains", func() {
+		When("item is present", func() {
+			It("🧪 should: return true", func() {
+				set.All(rainbow...)
+				Expect(set.Contains("richard")).To(BeTrue(),
+					lab.Reason("richard IS contained in set"),
+				)
+			})
+		})
+
+		When("item is NOT present", func() {
+			It("🧪 should: return false", func() {
+				set.All(rainbow...)
+				Expect(set.Contains("james")).To(BeFalse(),
+					lab.Reason("james is NOT contained in set"),
+				)
+			})
+		})
+	})
 })

core/navigator.go

@@ -7,9 +7,3 @@ import (
 type Navigator interface {
 	Navigate(ctx context.Context) (TraverseResult, error)
 }
-
-type Navigate func() (TraverseResult, error)
-
-func (fn Navigate) Navigate() (TraverseResult, error) {
-	return fn()
-}

core/node.go

@@ -65,23 +65,11 @@ func Root(root string, info fs.FileInfo) *Node {
 	return node
 }
 
-// Clone makes shallow copy of Node (excluding the error).
-func (n *Node) Clone() *Node {
-	c := *n
-	c.Error = nil
-
-	return &c
-}
-
 // IsFolder indicates wether this node is a folder.
 func (n *Node) IsFolder() bool {
 	return n.dir
 }
 
-func (n *Node) key() string {
-	return n.Extension.SubPath
-}
-
 func isDir(n *Node) bool {
 	if n.Entry != nil {
 		return n.Entry.IsDir()

cycle/events.go

@@ -148,11 +148,3 @@ func broadcastHibernate(listeners []HibernateHandler) HibernateHandler {
 }
 
 func nopHibernate(_ string) {}
-
-func broadcastSimple(listeners []SimpleHandler) SimpleHandler {
-	return func() {
-		for _, listener := range listeners {
-			listener()
-		}
-	}
-}

director-prime_test.go

@@ -48,6 +48,7 @@ var _ = Describe("Director(Prime)", Ordered, func() {
 							Handler:      noOpHandler,
 						},
 						tv.WithOnAscend(func(_ *core.Node) {}),
+						tv.WithNoRecurse(),
 					)).Navigate(ctx)
 
 					Expect(err).To(Succeed())
@@ -105,6 +106,7 @@ var _ = Describe("Director(Prime)", Ordered, func() {
 							Handler:      noOpHandler,
 						},
 						tv.WithOnBegin(func(_ *cycle.BeginState) {}),
+						tv.WithCPU(),
 					)).Navigate(ctx)
 
 					wg.Wait()

extent.go

@@ -97,7 +97,7 @@ func (ex *resumeExtent) options(settings ...pref.Option) (*pref.Options, error)
 	loaded, err := resume.Load(ex.fileSys.res, ex.w.From, settings...)
 	ex.loaded = loaded
 
-	// get the resume point from the resume persistence file
+	// TODO: get the resume point from the resume persistence file
 	// then set up hibernation with this defined as a hibernation
 	// filter.
 	//

internal/feat/filter/filter-plugin.go

@@ -35,10 +35,6 @@ type plugin struct {
 	scheme scheme
 }
 
-func (p *plugin) Name() string {
-	return "filtering"
-}
-
 func (p *plugin) Register(kc types.KernelController) error {
 	if err := p.BasePlugin.Register(kc); err != nil {
 		return err

internal/feat/filter/scheme-custom.go

@@ -6,7 +6,6 @@ import (
 	"github.com/snivilised/traverse/internal/measure"
 	"github.com/snivilised/traverse/internal/third/lo"
 	"github.com/snivilised/traverse/internal/types"
-	"github.com/snivilised/traverse/pref"
 )
 
 type customScheme struct {
@@ -17,12 +16,6 @@ type customScheme struct {
 func (s *customScheme) create() error {
 	s.filter = s.o.Filter.Custom
 
-	if s.o.Filter.Sink != nil {
-		s.o.Filter.Sink(pref.FilterReply{
-			Node: s.filter,
-		})
-	}
-
 	return s.filter.Validate()
 }