Adjusted code after review comments

ossf · Mar 25, 2024 · a334d0b · a334d0b
1 parent 9af3a79
commit a334d0b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/checks/evaluation/permissive_license_test.go b/checks/evaluation/permissive_license_test.go
@@ -69,9 +69,7 @@ func TestPermissiveLicense(t *testing.T) {
 			t.Parallel()
 			dl := scut.TestDetailLogger{}
 			got := PermissiveLicense(tt.name, tt.findings, &dl)
-			if !scut.ValidateTestReturn(t, tt.name, &tt.result, &got, &dl) {
-				t.Errorf("got %v, expected %v", got, tt.result)
-			}
+			scut.ValidateTestReturn(t, tt.name, &tt.result, &got, &dl)
 		})
 	}
 }
diff --git a/checks/permissive_license_test.go b/checks/permissive_license_test.go
@@ -95,9 +95,7 @@ func TestPermissiveLicenseFileSubdirectory(t *testing.T) {
 
 			res := PermissiveLicense(&req)
 
-			if !scut.ValidateTestReturn(t, tt.name, &tt.expected, &res, &dl) {
-				t.Fail()
-			}
+			scut.ValidateTestReturn(t, tt.name, &tt.expected, &res, &dl)
 
 			ctrl.Finish()
 		})

diff --git a/e2e/license_permissive_test.go b/e2e/license_permissive_test.go
@@ -52,8 +52,8 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 			}
 			result := checks.PermissiveLicense(&req)
 
-			Expect(scut.ValidateTestReturn(nil, "license found", &expected, &result,
-				&dl)).Should(BeTrue())
+			scut.ValidateTestReturn(GinkgoTB(), "license found", &expected, &result,
+				&dl)
 		})
 		It("Should return permissive license check works at commitSHA", func() {
 			dl := scut.TestDetailLogger{}
@@ -77,8 +77,8 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 			}
 			result := checks.PermissiveLicense(&req)
 
-			Expect(scut.ValidateTestReturn(nil, "license found", &expected, &result,
-				&dl)).Should(BeTrue())
+			scut.ValidateTestReturn(GinkgoTB(), "license found", &expected, &result,
+				&dl)
 		})
 		It("Should return permissive license check works - GitLab", func() {
 			skipIfTokenIsNot(gitlabPATTokenType, "GitLab only")
@@ -103,8 +103,8 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 			}
 			result := checks.PermissiveLicense(&req)
 
-			Expect(scut.ValidateTestReturn(nil, "license found", &expected, &result,
-				&dl)).Should(BeTrue())
+			scut.ValidateTestReturn(GinkgoTB(), "license found", &expected, &result,
+				&dl)
 		})
 		It("Should return permissive license check works at commitSHA - GitLab", func() {
 			skipIfTokenIsNot(gitlabPATTokenType, "GitLab only")
@@ -129,8 +129,8 @@ var _ = Describe("E2E TEST:"+checks.CheckLicense, func() {
 			}
 			result := checks.PermissiveLicense(&req)
 
-			Expect(scut.ValidateTestReturn(nil, "license found", &expected, &result,
-				&dl)).Should(BeTrue())
+			scut.ValidateTestReturn(GinkgoTB(), "license found", &expected, &result,
+				&dl)
 		})
 	})
 })
diff --git a/probes/hasPermissiveLicense/def.yml b/probes/hasPermissiveLicense/def.yml
@@ -20,7 +20,7 @@ implementation: >
  The implementation checks whether a permissive license is present
 outcome:
   - If a license file is found and is permissive, the probe returns a single OutcomePositive.
-  - If a license file is missing the probe returns a single OutcomeNotApplicable.
+  - If a license file is missing the probe returns a single OutcomeNegative.
   - If the license is not permissive, the probe returns a single OutcomeNegative.
 remediation:
   effort: High

diff --git a/probes/hasPermissiveLicense/impl.go b/probes/hasPermissiveLicense/impl.go
@@ -34,10 +34,10 @@ func Run(raw *checker.RawResults) ([]finding.Finding, string, error) {
 		return nil, "", fmt.Errorf("%w: raw", uerror.ErrNil)
 	}
 
-	if raw.LicenseResults.LicenseFiles == nil || len(raw.LicenseResults.LicenseFiles) == 0 {
+	if len(raw.LicenseResults.LicenseFiles) == 0 {
 		f, err := finding.NewWith(fs, Probe,
 			"project does not have a license file", nil,
-			finding.OutcomeNotApplicable)
+			finding.OutcomeNegative)
 		if err != nil {
 			return nil, Probe, fmt.Errorf("create finding: %w", err)
 		}

diff --git a/probes/hasPermissiveLicense/impl_test.go b/probes/hasPermissiveLicense/impl_test.go
@@ -83,7 +83,7 @@ func Test_Run(t *testing.T) {
 				},
 			},
 			outcomes: []finding.Outcome{
-				finding.OutcomeNotApplicable,
+				finding.OutcomeNegative,
 			},
 		},
 		{
@@ -94,7 +94,7 @@ func Test_Run(t *testing.T) {
 				},
 			},
 			outcomes: []finding.Outcome{
-				finding.OutcomeNotApplicable,
+				finding.OutcomeNegative,
 			},
 		},
 		{
@@ -105,7 +105,7 @@ func Test_Run(t *testing.T) {
 				},
 			},
 			outcomes: []finding.Outcome{
-				finding.OutcomeNotApplicable,
+				finding.OutcomeNegative,
 			},
 		},
 	}