fix: Fix passing tests not being visible in JUnit test output (#1534)

Signed-off-by: Oğuzhan Durgun <oguzhandurgun95@gmail.com>
cerbos · Apr 14, 2023 · b6fdc81 · b6fdc81
1 parent b6756b0
commit b6fdc81
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 5 deletions.
diff --git a/internal/test/testdata/verify_junit/cases/case_006.yaml b/internal/test/testdata/verify_junit/cases/case_006.yaml
@@ -0,0 +1,2 @@
+---
+description: Passing tests
diff --git a/internal/test/testdata/verify_junit/cases/case_006.yaml.golden b/internal/test/testdata/verify_junit/cases/case_006.yaml.golden
@@ -0,0 +1,19 @@
+<testsuites errors="0" failures="0" skipped="0" tests="2">
+  <testsuite description="Tests for verifying the company resource policy" name="CompanyTestSuite" file="suite_test.yaml" errors="0" failures="0" skipped="0" tests="2">
+    <properties></properties>
+    <testcase file="suite_test.yaml" classname="admin.company.create" name="Company Test 1">
+      <properties>
+        <property name="principal">admin</property>
+        <property name="resource">company</property>
+        <property name="action">create</property>
+      </properties>
+    </testcase>
+    <testcase file="suite_test.yaml" classname="admin.company.create" name="Company Test 2">
+      <properties>
+        <property name="principal">admin</property>
+        <property name="resource">company</property>
+        <property name="action">create</property>
+      </properties>
+    </testcase>
+  </testsuite>
+</testsuites>
diff --git a/internal/test/testdata/verify_junit/cases/case_006.yaml.input b/internal/test/testdata/verify_junit/cases/case_006.yaml.input
@@ -0,0 +1,46 @@
+-- suite_test.yaml --
+---
+name: CompanyTestSuite
+description: Tests for verifying the company resource policy
+principals:
+  admin:
+    id: admin
+    roles:
+      - admin
+  user:
+    id: user
+    roles:
+      - user
+resources:
+  company:
+    id: xx1
+    kind: company
+
+tests:
+  - name: Company Test 1
+    input:
+      principals:
+        - admin
+      resources:
+        - company
+      actions:
+        - create
+    expected:
+      - principal: admin
+        resource: company
+        actions:
+          create: EFFECT_ALLOW
+
+  - name: Company Test 2
+    input:
+      principals:
+        - admin
+      resources:
+        - company
+      actions:
+        - create
+    expected:
+      - principal: admin
+        resource: company
+        actions:
+          create: EFFECT_ALLOW
diff --git a/internal/verify/junit/junit.go b/internal/verify/junit/junit.go
@@ -42,7 +42,7 @@ func Build(results *policyv1.TestResults, verbose bool) (*TestSuites, error) {
 			suite.Skipped++
 			skippedCount++
 		case policyv1.TestResults_RESULT_PASSED, policyv1.TestResults_RESULT_FAILED:
-			testCases, summary, err := processTestCases(s, verbose)
+			testCases, summary, err := processTestCases(s)
 			if err != nil {
 				return nil, fmt.Errorf("failed to process test cases: %w", err)
 			}
@@ -82,7 +82,7 @@ func Build(results *policyv1.TestResults, verbose bool) (*TestSuites, error) {
 	}, nil
 }
 
-func processTestCases(s *policyv1.TestResults_Suite, verbose bool) ([]testCase, Summary, error) {
+func processTestCases(s *policyv1.TestResults_Suite) ([]testCase, Summary, error) {
 	var testCases []testCase
 	var summary Summary
 	for _, tc := range s.TestCases {
@@ -124,9 +124,6 @@ func processTestCases(s *policyv1.TestResults_Suite, verbose bool) ([]testCase,
 						}
 						summary.Failures++
 					case policyv1.TestResults_RESULT_PASSED:
-						if !verbose {
-							continue
-						}
 					case policyv1.TestResults_RESULT_SKIPPED:
 						summary.Skipped++
 						testCase.Skipped = &skipped{