Merge pull request #2172 from josephschorr/memdb-coverage

Improve test coverage of memdb datastore with some new rel tests
authzed · Dec 17, 2024 · fb5302f · fb5302f
2 parents 397fefb + 68fe232
commit fb5302f
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 0 deletions.
diff --git a/internal/datastore/memdb/errors_test.go b/internal/datastore/memdb/errors_test.go
@@ -0,0 +1,15 @@
+package memdb
+
+import (
+	"fmt"
+	"testing"
+
+	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
+
+	"github.com/authzed/spicedb/pkg/spiceerrors"
+)
+
+func TestErrors(t *testing.T) {
+	err := NewSerializationMaxRetriesReachedErr(fmt.Errorf("some error"))
+	spiceerrors.RequireReason(t, v1.ErrorReason_ERROR_REASON_UNSPECIFIED, err, "details")
+}
diff --git a/pkg/datastore/test/relationships.go b/pkg/datastore/test/relationships.go
@@ -1021,6 +1021,19 @@ func QueryRelationshipsWithVariousFiltersTest(t *testing.T, tester DatastoreTest
 			},
 			expected: []string{"document:first#viewer@user:tom", "document:second#viewer@user:tom"},
 		},
+		{
+			name: "nonmatching resource type",
+			filter: datastore.RelationshipsFilter{
+				OptionalResourceType: "other",
+			},
+			relationships: []string{
+				"document:first#viewer@user:tom",
+				"document:second#viewer@user:tom",
+				"folder:secondfolder#viewer@user:tom",
+				"folder:someotherfolder#viewer@user:tom",
+			},
+			expected: []string{},
+		},
 		{
 			name: "resource id",
 			filter: datastore.RelationshipsFilter{
@@ -1397,6 +1410,73 @@ func QueryRelationshipsWithVariousFiltersTest(t *testing.T, tester DatastoreTest
 				"document:first#viewer@user:tom",
 			},
 		},
+		{
+			name: "multiple subject IDs with subject type",
+			filter: datastore.RelationshipsFilter{
+				OptionalSubjectsSelectors: []datastore.SubjectsSelector{
+					{
+						OptionalSubjectType: "user",
+						OptionalSubjectIds:  []string{"tom", "fred"},
+					},
+				},
+			},
+			relationships: []string{
+				"document:first#viewer@user:tom",
+				"document:first#viewer@user:fred",
+				"document:second#viewer@anotheruser:fred#something",
+				"folder:secondfolder#viewer@anotheruser:sarah",
+				"folder:someotherfolder#viewer@user:tom",
+			},
+			expected: []string{
+				"document:first#viewer@user:tom",
+				"document:first#viewer@user:fred",
+				"folder:someotherfolder#viewer@user:tom",
+			},
+		},
+		{
+			name: "multiple subject filters",
+			filter: datastore.RelationshipsFilter{
+				OptionalSubjectsSelectors: []datastore.SubjectsSelector{
+					{
+						OptionalSubjectType: "user",
+						OptionalSubjectIds:  []string{"tom", "fred"},
+					},
+					{
+						OptionalSubjectType: "anotheruser",
+						OptionalSubjectIds:  []string{"tom", "jerry"},
+					},
+				},
+			},
+			relationships: []string{
+				"document:first#viewer@user:tom",
+				"document:first#viewer@user:fred",
+				"document:second#viewer@anotheruser:fred#something",
+				"folder:secondfolder#viewer@anotheruser:tom",
+				"folder:secondfolder#viewer@anotheruser:sarah",
+				"folder:secondfolder#viewer@anotheruser:jerry",
+				"folder:someotherfolder#viewer@user:tom",
+			},
+			expected: []string{
+				"document:first#viewer@user:tom",
+				"document:first#viewer@user:fred",
+				"folder:someotherfolder#viewer@user:tom",
+				"folder:secondfolder#viewer@anotheruser:tom",
+				"folder:secondfolder#viewer@anotheruser:jerry",
+			},
+		},
+		{
+			name: "relationships with expiration",
+			filter: datastore.RelationshipsFilter{
+				OptionalResourceType: "document",
+			},
+			relationships: []string{
+				"document:first#expiring_viewer@user:tom[expiration:2020-01-01T00:00:00Z]",
+				"document:first#expiring_viewer@user:fred[expiration:2321-01-01T00:00:00Z]",
+			},
+			expected: []string{
+				"document:first#expiring_viewer@user:fred[expiration:2321-01-01T00:00:00Z]",
+			},
+		},
 	}
 
 	for _, tc := range tcs {