Remove underscore from test names

Emyrk · Emyrk · commit a4e038f44bd2 · 2022-04-06T10:08:16.000-05:00
unexport fields from zobject
diff --git a/coderd/authz/authz_test.go b/coderd/authz/authz_test.go
@@ -11,7 +11,7 @@ import (
 
 var nilSet = authztest.Set{nil}
 
-func Test_ExhaustiveAuthorize(t *testing.T) {
+func TestExhaustiveAuthorize(t *testing.T) {
 	t.Parallel()
 
 	all := authztest.GroupedPermissions(authztest.AllPermissions())
diff --git a/coderd/authz/authztest/level_test.go b/coderd/authz/authztest/level_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/coder/coder/coderd/authz/authztest"
 )
 
-func Test_GroupedPermissions(t *testing.T) {
+func TestGroupedPermissions(t *testing.T) {
 	t.Parallel()
 
 	set := make(authztest.Set, 0)
diff --git a/coderd/authz/authztest/permissions_test.go b/coderd/authz/authztest/permissions_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coder/coder/coderd/authz/authztest"
 )
 
-func Test_AllPermissions(t *testing.T) {
+func TestAllPermissions(t *testing.T) {
 	t.Parallel()
 
 	// If this changes, then we might have to fix some other tests. This constant
diff --git a/coderd/authz/authztest/role_test.go b/coderd/authz/authztest/role_test.go
@@ -9,7 +9,7 @@ import (
 	crand "github.com/coder/coder/cryptorand"
 )
 
-func Test_NewRole(t *testing.T) {
+func TestNewRole(t *testing.T) {
 	t.Parallel()
 
 	for i := 0; i < 50; i++ {
diff --git a/coderd/authz/authztest/set_test.go b/coderd/authz/authztest/set_test.go
@@ -10,7 +10,7 @@ import (
 	crand "github.com/coder/coder/cryptorand"
 )
 
-func Test_Set(t *testing.T) {
+func TestSet(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Simple", func(t *testing.T) {
diff --git a/coderd/authz/example_test.go b/coderd/authz/example_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/coder/coder/coderd/authz"
 )
 
-// Test_Example gives some examples on how to use the authz library.
+// TestExample gives some examples on how to use the authz library.
 // This serves to test syntax more than functionality.
-func Test_Example(t *testing.T) {
+func TestExample(t *testing.T) {
 	t.Parallel()
 
 	// user will become an authn object, and can even be a database.User if it
diff --git a/coderd/authz/object.go b/coderd/authz/object.go
@@ -25,25 +25,25 @@ var _ OrgResource = (*zObject)(nil)
 // that represents the set of workspaces you are trying to get access too.
 // Do not export this type, as it can be created from a resource type constant.
 type zObject struct {
-	ObjectID   string `json:"object_id"`
-	OwnedBy    string `json:"owner_id"`
-	OwnedByOrg string `json:"org_owner_id"`
+	id         string
+	owner      string
+	OwnedByOrg string
 
 	// ObjectType is "workspace", "project", "devurl", etc
-	ObjectType ResourceType `json:"object_type"`
+	ObjectType ResourceType
 	// TODO: SharedUsers?
 }
 
 func (z zObject) ID() string {
-	return z.ObjectID
+	return z.id
 }
 
 func (z zObject) ResourceType() ResourceType {
 	return z.ObjectType
 }
 
 func (z zObject) OwnerID() string {
-	return z.OwnedBy
+	return z.owner
 }
 
 func (z zObject) OrgOwnerID() string {
@@ -60,12 +60,12 @@ func (z zObject) Org(orgID string) zObject {
 // Owner adds an OwnerID to the resource
 //nolint:revive
 func (z zObject) Owner(id string) zObject {
-	z.OwnedBy = id
+	z.owner = id
 	return z
 }
 
 //nolint:revive
 func (z zObject) AsID(id string) zObject {
-	z.ObjectID = id
+	z.id = id
 	return z
 }
diff --git a/coderd/authz/permission_test.go b/coderd/authz/permission_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/coder/coder/coderd/authz"
 )
 
-func Test_PermissionString(t *testing.T) {
+func TestPermissionString(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
@@ -72,7 +72,7 @@ func Test_PermissionString(t *testing.T) {
 	}
 }
 
-func Test_ParsePermissions(t *testing.T) {
+func TestParsePermissions(t *testing.T) {
 	t.Parallel()
 
 	testCases := []struct {
diff --git a/coderd/authz/resources.go b/coderd/authz/resources.go
@@ -31,15 +31,15 @@ func (r ResourceType) Org(orgID string) zObject {
 //nolint:revive
 func (r ResourceType) Owner(id string) zObject {
 	return zObject{
-		OwnedBy:    id,
+		owner:      id,
 		ObjectType: r,
 	}
 }
 
 //nolint:revive
 func (r ResourceType) AsID(id string) zObject {
 	return zObject{
-		ObjectID:   id,
+		id:         id,
 		ObjectType: r,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/coder/coder/coderd/authz/authztest"`
`10`	`10`	`)`
`11`	`11`
`12`		`-func Test_GroupedPermissions(t *testing.T) {`
	`12`	`+func TestGroupedPermissions(t *testing.T) {`
`13`	`13`	`t.Parallel()`
`14`	`14`
`15`	`15`	`set := make(authztest.Set, 0)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/coder/coder/coderd/authz/authztest"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func Test_AllPermissions(t *testing.T) {`
	`11`	`+func TestAllPermissions(t *testing.T) {`
`12`	`12`	`t.Parallel()`
`13`	`13`
`14`	`14`	`// If this changes, then we might have to fix some other tests. This constant`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`crand "github.com/coder/coder/cryptorand"`
`10`	`10`	`)`
`11`	`11`
`12`		`-func Test_NewRole(t *testing.T) {`
	`12`	`+func TestNewRole(t *testing.T) {`
`13`	`13`	`t.Parallel()`
`14`	`14`
`15`	`15`	`for i := 0; i < 50; i++ {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`crand "github.com/coder/coder/cryptorand"`
`11`	`11`	`)`
`12`	`12`
`13`		`-func Test_Set(t *testing.T) {`
	`13`	`+func TestSet(t *testing.T) {`
`14`	`14`	`t.Parallel()`
`15`	`15`
`16`	`16`	`t.Run("Simple", func(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/coder/coder/coderd/authz"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func Test_PermissionString(t *testing.T) {`
	`11`	`+func TestPermissionString(t *testing.T) {`
`12`	`12`	`t.Parallel()`
`13`	`13`
`14`	`14`	`testCases := []struct {`
`@@ -72,7 +72,7 @@ func Test_PermissionString(t *testing.T) {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-func Test_ParsePermissions(t *testing.T) {`
	`75`	`+func TestParsePermissions(t *testing.T) {`
`76`	`76`	`t.Parallel()`
`77`	`77`
`78`	`78`	`testCases := []struct {`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ func (r ResourceType) Org(orgID string) zObject {`
`31`	`31`	`//nolint:revive`
`32`	`32`	`func (r ResourceType) Owner(id string) zObject {`
`33`	`33`	`return zObject{`
`34`		`- OwnedBy: id,`
	`34`	`+ owner: id,`
`35`	`35`	`ObjectType: r,`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`//nolint:revive`
`40`	`40`	`func (r ResourceType) AsID(id string) zObject {`
`41`	`41`	`return zObject{`
`42`		`- ObjectID: id,`
	`42`	`+ id: id,`
`43`	`43`	`ObjectType: r,`
`44`	`44`	`}`
`45`	`45`	`}`