update test to use sourcestest

trufflesecurity · Oct 16, 2023 · ec3c59d · ec3c59d
1 parent c99e0b9
commit ec3c59d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/pkg/sources/errors_test.go b/pkg/sources/errors_test.go
@@ -1,8 +1,8 @@
 package sources
 
 import (
+	"errors"
 	"fmt"
-	"reflect"
 	"sync"
 	"testing"
 )
@@ -40,7 +40,7 @@ func TestNewScanErrors(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			got := NewScanErrors()
 
-			if !reflect.DeepEqual(got, tc.want) {
+			if !errors.Is(got.Errors(), tc.want.Errors()) {
 				t.Errorf("got %+v, want %+v", got, tc.want)
 			}
 		})

diff --git a/pkg/sources/test_helpers.go b/pkg/sources/test_helpers.go
@@ -4,8 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"time"
-
-	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
 )
 
 type ChunkFunc func(chunk *Chunk) error
@@ -29,27 +27,3 @@ func HandleTestChannel(chunksCh chan *Chunk, cf ChunkFunc) error {
 		}
 	}
 }
-
-type TestReporter struct {
-	Units     []SourceUnit
-	UnitErrs  []error
-	Chunks    []Chunk
-	ChunkErrs []error
-}
-
-func (t *TestReporter) UnitOk(_ context.Context, unit SourceUnit) error {
-	t.Units = append(t.Units, unit)
-	return nil
-}
-func (t *TestReporter) UnitErr(_ context.Context, err error) error {
-	t.UnitErrs = append(t.UnitErrs, err)
-	return nil
-}
-func (t *TestReporter) ChunkOk(_ context.Context, chunk Chunk) error {
-	t.Chunks = append(t.Chunks, chunk)
-	return nil
-}
-func (t *TestReporter) ChunkErr(_ context.Context, err error) error {
-	t.ChunkErrs = append(t.ChunkErrs, err)
-	return nil
-}
diff --git a/pkg/sources/travisci/travisci_test.go b/pkg/sources/travisci/travisci_test.go
@@ -11,12 +11,10 @@ import (
 	"github.com/trufflesecurity/trufflehog/v3/pkg/context"
 	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/source_metadatapb"
 	"github.com/trufflesecurity/trufflehog/v3/pkg/pb/sourcespb"
-	"github.com/trufflesecurity/trufflehog/v3/pkg/sources"
+	"github.com/trufflesecurity/trufflehog/v3/pkg/sourcestest"
 )
 
 func TestSource_Scan(t *testing.T) {
-	// ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
-	// defer cancel()
 	ctx := context.Background()
 
 	secret, err := common.GetTestSecret(ctx)
@@ -76,7 +74,7 @@ func TestSource_Scan(t *testing.T) {
 				t.Fatalf("Source.Init() error = %v, wantErr %v", err, tt.wantErr)
 			}
 
-			reporter := sources.TestReporter{}
+			reporter := sourcestest.TestReporter{}
 			s.returnAfterFirstChunk = true
 
 			err = s.Enumerate(ctx, &reporter)