tests

ossf · Mar 29, 2022 · d323e17 · d323e17
1 parent c21d573
commit d323e17
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/checks/evaluation/license.go b/checks/evaluation/license.go
@@ -15,18 +15,12 @@
 package evaluation
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/ossf/scorecard/v4/checker"
 	sce "github.com/ossf/scorecard/v4/errors"
 )
 
-var (
-	errInvalidArgType   = errors.New("invalid arg type")
-	errInvalidArgLength = errors.New("invalid arg length")
-)
-
 // License applies the score policy for the License check.
 func License(name string, dl checker.DetailLogger,
 	r *checker.LicenseData,

diff --git a/checks/raw/license.go b/checks/raw/license.go
@@ -66,16 +66,19 @@ var (
 func License(c *checker.CheckRequest) (checker.LicenseData, error) {
 	var results checker.LicenseData
 	var path string
+
 	err := fileparser.OnAllFilesDo(c.RepoClient, isLicenseFile, &path)
 	if err != nil {
 		return results, fmt.Errorf("fileparser.OnAllFilesDo: %w", err)
 	}
 
-	results.Files = append(results.Files,
-		checker.File{
-			Path: path,
-			Type: checker.FileTypeSource,
-		})
+	if path != "" {
+		results.Files = append(results.Files,
+			checker.File{
+				Path: path,
+				Type: checker.FileTypeSource,
+			})
+	}
 
 	return results, nil
 }

diff --git a/checks/raw/license_test.go b/checks/raw/license_test.go
@@ -15,17 +15,7 @@
 package raw
 
 import (
-	"context"
-	"errors"
 	"testing"
-
-	"github.com/golang/mock/gomock"
-
-	"github.com/ossf/scorecard/v4/checker"
-	"github.com/ossf/scorecard/v4/clients"
-	"github.com/ossf/scorecard/v4/clients/localdir"
-	"github.com/ossf/scorecard/v4/log"
-	scut "github.com/ossf/scorecard/v4/utests"
 )
 
 func TestLicenseFileCheck(t *testing.T) {

diff --git a/e2e/license_test.go b/e2e/license_test.go
@@ -48,7 +48,7 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 				NumberOfInfo:  1,
 				NumberOfDebug: 0,
 			}
-			result := checks.LicenseCheck(&req)
+			result := checks.License(&req)
 
 			Expect(result.Error).Should(BeNil())
 			Expect(result.Pass).Should(BeTrue())
@@ -76,7 +76,7 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 				NumberOfInfo:  1,
 				NumberOfDebug: 0,
 			}
-			result := checks.LicenseCheck(&req)
+			result := checks.License(&req)
 
 			Expect(result.Error).Should(BeNil())
 			Expect(result.Pass).Should(BeTrue())