Allow out of order slicing

Emyrk · Emyrk · commit 58b71f99a9e9 · 2023-02-03T14:09:23.000-06:00
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -151,7 +151,12 @@ MethodLoop:
 				require.Equal(t, len(testCase.ExpectedOutputs), len(outputs), "method %q returned unexpected number of outputs", testName)
 				for i := range outputs {
 					a, b := testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface()
-					require.Equal(t, a, b, "method %q returned unexpected output %d", testName, i)
+					if reflect.TypeOf(a).Kind() == reflect.Slice || reflect.TypeOf(a).Kind() == reflect.Array {
+						// Order does not matter
+						require.ElementsMatch(t, a, b, "method %q returned unexpected output %d", testName, i)
+					} else {
+						require.Equal(t, a, b, "method %q returned unexpected output %d", testName, i)
+					}
 				}
 			}
 
diff --git a/coderd/authzquery/template_test.go b/coderd/authzquery/template_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/database/dbgen"
 	"github.com/coder/coder/coderd/rbac"
+	"github.com/coder/coder/coderd/util/slice"
 )
 
 func (suite *MethodTestSuite) TestTemplate() {
@@ -137,7 +138,7 @@ func (suite *MethodTestSuite) TestTemplate() {
 			})
 			return methodCase(values([]uuid.UUID{tv1.ID, tv2.ID, tv3.ID}),
 				asserts(t1, rbac.ActionRead, t2, rbac.ActionRead),
-				values([]database.TemplateVersion{tv1, tv2, tv3}))
+				values(slice.New(tv1, tv2, tv3)))
 		})
 	})
 	suite.Run("GetTemplateVersionsByTemplateID", func() {
@@ -152,7 +153,7 @@ func (suite *MethodTestSuite) TestTemplate() {
 			return methodCase(values(database.GetTemplateVersionsByTemplateIDParams{
 				TemplateID: t1.ID,
 			}), asserts(t1, rbac.ActionRead),
-				values([]database.TemplateVersion{a, b}))
+				values(slice.New(a, b)))
 		})
 	})
 	suite.Run("GetTemplateVersionsCreatedAfter", func() {
@@ -175,8 +176,7 @@ func (suite *MethodTestSuite) TestTemplate() {
 			a := dbgen.Template(t, db, database.Template{})
 			// No asserts because SQLFilter.
 			return methodCase(values(database.GetTemplatesWithFilterParams{}),
-				asserts(),
-				values([]database.Template{a}))
+				asserts(), values(slice.New(a)))
 		})
 	})
 	suite.Run("GetAuthorizedTemplates", func() {
@@ -185,7 +185,7 @@ func (suite *MethodTestSuite) TestTemplate() {
 			// No asserts because SQLFilter.
 			return methodCase(values(database.GetTemplatesWithFilterParams{}, emptyPreparedAuthorized{}),
 				asserts(),
-				values([]database.Template{a}))
+				values(slice.New(a)))
 		})
 	})
 	suite.Run("InsertTemplate", func() {

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,12 @@ MethodLoop:`
`151`	`151`	`require.Equal(t, len(testCase.ExpectedOutputs), len(outputs), "method %q returned unexpected number of outputs", testName)`
`152`	`152`	`for i := range outputs {`
`153`	`153`	`a, b := testCase.ExpectedOutputs[i].Interface(), outputs[i].Interface()`
`154`		`- require.Equal(t, a, b, "method %q returned unexpected output %d", testName, i)`
	`154`	`+ if reflect.TypeOf(a).Kind() == reflect.Slice \|\| reflect.TypeOf(a).Kind() == reflect.Array {`
	`155`	`+ // Order does not matter`
	`156`	`+ require.ElementsMatch(t, a, b, "method %q returned unexpected output %d", testName, i)`
	`157`	`+ } else {`
	`158`	`+ require.Equal(t, a, b, "method %q returned unexpected output %d", testName, i)`
	`159`	`+ }`
`155`	`160`	`}`
`156`	`161`	`}`
`157`	`162`