Merge pull request #1793 from josephschorr/itc-subjects

Small increase in test coverage for subjects testutil
authzed · Mar 13, 2024 · e7af49e · e7af49e
2 parents 031e5b4 + f8a9be0
commit e7af49e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/internal/testutil/subjects.go b/internal/testutil/subjects.go
@@ -68,12 +68,14 @@ func Wildcard(exclusions ...string) *v1.FoundSubject {
 
 // RequireEquivalentSets requires that the given sets of subjects are equivalent.
 func RequireEquivalentSets(t *testing.T, expected []*v1.FoundSubject, found []*v1.FoundSubject) {
+	t.Helper()
 	err := CheckEquivalentSets(expected, found)
 	require.NoError(t, err, "found different subject sets: %v", err)
 }
 
 // RequireExpectedSubject requires that the given expected and produced subjects match.
 func RequireExpectedSubject(t *testing.T, expected *v1.FoundSubject, produced **v1.FoundSubject) {
+	t.Helper()
 	if expected == nil {
 		require.Nil(t, produced)
 	} else {

diff --git a/internal/testutil/subjects_test.go b/internal/testutil/subjects_test.go
@@ -11,13 +11,14 @@ import (
 )
 
 var (
-	caveatexpr = caveats.CaveatExprForTesting
-	caveatAnd  = caveats.And
-	caveatOr   = caveats.Or
-	sub        = FoundSubject
-	wc         = Wildcard
-	csub       = CaveatedFoundSubject
-	cwc        = CaveatedWildcard
+	caveatexpr   = caveats.CaveatExprForTesting
+	caveatAnd    = caveats.And
+	caveatOr     = caveats.Or
+	caveatInvert = caveats.Invert
+	sub          = FoundSubject
+	wc           = Wildcard
+	csub         = CaveatedFoundSubject
+	cwc          = CaveatedWildcard
 )
 
 func TestCompareSubjects(t *testing.T) {
@@ -56,6 +57,21 @@ func TestCompareSubjects(t *testing.T) {
 			sub("2"),
 			false,
 		},
+		{
+			csub("1", caveatexpr("first")),
+			csub("1", caveatInvert(caveatexpr("first"))),
+			false,
+		},
+		{
+			csub("1", caveatInvert(caveatexpr("first"))),
+			csub("1", caveatInvert(caveatexpr("first"))),
+			true,
+		},
+		{
+			csub("1", caveatInvert(caveatexpr("first"))),
+			csub("1", caveatInvert(caveatexpr("second"))),
+			false,
+		},
 		{
 			csub("1", caveatexpr("first")),
 			csub("1", caveatexpr("first")),