Fix test asserts: reverse expected and actual params (#3027)

.golangci.yml

@@ -6,6 +6,10 @@ run:
 linters-settings:
   errcheck:
     ignore: fmt:.*,[rR]ead|[wW]rite|[cC]lose,io:Copy
+  testifylint:
+    disable-all: true
+    enable:
+      - expected-actual
 
 linters:
   disable-all: true
@@ -23,6 +27,7 @@ linters:
     - nakedret
     - prealloc
     - staticcheck
+    - testifylint
     - typecheck
     - unconvert
     - unused

codegen/config/binder_test.go

@@ -28,7 +28,7 @@ func TestSlicePointerBinding(t *testing.T) {
 			panic(err)
 		}
 
-		require.Equal(t, ta.GO.String(), "[]*github.com/99designs/gqlgen/codegen/config/testdata/autobinding/chat.Message")
+		require.Equal(t, "[]*github.com/99designs/gqlgen/codegen/config/testdata/autobinding/chat.Message", ta.GO.String())
 	})
 
 	t.Run("with OmitSliceElementPointers", func(t *testing.T) {
@@ -41,7 +41,7 @@ func TestSlicePointerBinding(t *testing.T) {
 			panic(err)
 		}
 
-		require.Equal(t, ta.GO.String(), "[]github.com/99designs/gqlgen/codegen/config/testdata/autobinding/chat.Message")
+		require.Equal(t, "[]github.com/99designs/gqlgen/codegen/config/testdata/autobinding/chat.Message", ta.GO.String())
 	})
 }
 

codegen/config/config_test.go

@@ -48,11 +48,11 @@ func TestReadConfig(t *testing.T) {
 		require.NoError(t, err)
 
 		if runtime.GOOS == "windows" {
-			require.Equal(t, c.SchemaFilename[0], `testdata\cfg\glob\bar\bar with spaces.graphql`)
-			require.Equal(t, c.SchemaFilename[1], `testdata\cfg\glob\foo\foo.graphql`)
+			require.Equal(t, `testdata\cfg\glob\bar\bar with spaces.graphql`, c.SchemaFilename[0])
+			require.Equal(t, `testdata\cfg\glob\foo\foo.graphql`, c.SchemaFilename[1])
 		} else {
-			require.Equal(t, c.SchemaFilename[0], "testdata/cfg/glob/bar/bar with spaces.graphql")
-			require.Equal(t, c.SchemaFilename[1], "testdata/cfg/glob/foo/foo.graphql")
+			require.Equal(t, "testdata/cfg/glob/bar/bar with spaces.graphql", c.SchemaFilename[0])
+			require.Equal(t, "testdata/cfg/glob/foo/foo.graphql", c.SchemaFilename[1])
 		}
 	})
 

codegen/config/package_test.go

@@ -14,7 +14,7 @@ func TestPackageConfig(t *testing.T) {
 
 		require.NoError(t, p.Check())
 
-		require.Equal(t, p.Package, "config_test_data")
+		require.Equal(t, "config_test_data", p.Package)
 		require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 		require.Equal(t, "config_test_data", p.Pkg().Name())
@@ -30,7 +30,7 @@ func TestPackageConfig(t *testing.T) {
 
 		require.NoError(t, p.Check())
 
-		require.Equal(t, p.Package, "wololo")
+		require.Equal(t, "wololo", p.Package)
 		require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 		require.Equal(t, "wololo", p.Pkg().Name())

codegen/config/resolver_test.go

@@ -16,7 +16,7 @@ func TestResolverConfig(t *testing.T) {
 			require.NoError(t, p.Check())
 			require.NoError(t, p.Check())
 
-			require.Equal(t, p.Package, "config_test_data")
+			require.Equal(t, "config_test_data", p.Package)
 			require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 			require.Equal(t, "config_test_data", p.Pkg().Name())
@@ -33,7 +33,7 @@ func TestResolverConfig(t *testing.T) {
 			require.NoError(t, p.Check())
 			require.NoError(t, p.Check())
 
-			require.Equal(t, p.Package, "wololo")
+			require.Equal(t, "wololo", p.Package)
 			require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 			require.Equal(t, "wololo", p.Pkg().Name())
@@ -81,7 +81,7 @@ func TestResolverConfig(t *testing.T) {
 			require.NoError(t, p.Check())
 			require.NoError(t, p.Check())
 
-			require.Equal(t, p.Package, "config_test_data")
+			require.Equal(t, "config_test_data", p.Package)
 			require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 			require.Equal(t, "config_test_data", p.Pkg().Name())
@@ -98,7 +98,7 @@ func TestResolverConfig(t *testing.T) {
 			require.NoError(t, p.Check())
 			require.NoError(t, p.Check())
 
-			require.Equal(t, p.Package, "wololo")
+			require.Equal(t, "wololo", p.Package)
 			require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 			require.Equal(t, "wololo", p.Pkg().Name())
@@ -115,7 +115,7 @@ func TestResolverConfig(t *testing.T) {
 			require.NoError(t, p.Check())
 			require.NoError(t, p.Check())
 
-			require.Equal(t, p.Package, "config_test_data")
+			require.Equal(t, "config_test_data", p.Package)
 			require.Equal(t, "github.com/99designs/gqlgen/codegen/config/testdata", p.ImportPath())
 
 			require.Equal(t, "config_test_data", p.Pkg().Name())

codegen/field_test.go

@@ -190,7 +190,7 @@ func TestField_CallArgs(t *testing.T) {
 
 	for _, tc := range tt {
 		t.Run(tc.Name, func(t *testing.T) {
-			require.Equal(t, tc.CallArgs(), tc.Expected)
+			require.Equal(t, tc.Expected, tc.CallArgs())
 		})
 	}
 }

codegen/templates/templates_test.go

@@ -308,7 +308,7 @@ func Test_wordWalker(t *testing.T) {
 
 	for i, at := range theTests {
 		t.Run(fmt.Sprintf("wordWalker-%d", i), func(t *testing.T) {
-			require.Equal(t, at.input, at.expected)
+			require.Equal(t, at.expected, at.input)
 		})
 	}
 }

codegen/testserver/followschema/defaults_test.go

@@ -13,9 +13,9 @@ import (
 func assertDefaults(t *testing.T, ret *DefaultParametersMirror) {
 	require.NotNil(t, ret)
 	require.NotNil(t, ret.FalsyBoolean)
-	require.Equal(t, *ret.FalsyBoolean, false)
+	require.Equal(t, false, *ret.FalsyBoolean)
 	require.NotNil(t, ret.TruthyBoolean)
-	require.Equal(t, *ret.TruthyBoolean, true)
+	require.Equal(t, true, *ret.TruthyBoolean)
 }
 
 func TestDefaults(t *testing.T) {

codegen/testserver/followschema/directive_test.go

@@ -301,7 +301,7 @@ func TestDirectives(t *testing.T) {
 
 			c.MustPost(`query { directiveField@logged(id:"testes_id") }`, &resp)
 
-			require.Equal(t, resp.DirectiveField, `testes_id`)
+			require.Equal(t, `testes_id`, resp.DirectiveField)
 		})
 		t.Run("without field directive", func(t *testing.T) {
 			var resp struct {

codegen/testserver/followschema/embedded_test.go

@@ -40,7 +40,7 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase1 { exportedEmbeddedPointerExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase1.ExportedEmbeddedPointerExportedMethod, "ExportedEmbeddedPointerExportedMethodResponse")
+		require.Equal(t, "ExportedEmbeddedPointerExportedMethodResponse", resp.EmbeddedCase1.ExportedEmbeddedPointerExportedMethod)
 	})
 
 	t.Run("embedded case 2", func(t *testing.T) {
@@ -51,7 +51,7 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase2 { unexportedEmbeddedPointerExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase2.UnexportedEmbeddedPointerExportedMethod, "UnexportedEmbeddedPointerExportedMethodResponse")
+		require.Equal(t, "UnexportedEmbeddedPointerExportedMethodResponse", resp.EmbeddedCase2.UnexportedEmbeddedPointerExportedMethod)
 	})
 
 	t.Run("embedded case 3", func(t *testing.T) {
@@ -62,6 +62,6 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase3 { unexportedEmbeddedInterfaceExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase3.UnexportedEmbeddedInterfaceExportedMethod, "UnexportedEmbeddedInterfaceExportedMethod")
+		require.Equal(t, "UnexportedEmbeddedInterfaceExportedMethod", resp.EmbeddedCase3.UnexportedEmbeddedInterfaceExportedMethod)
 	})
 }

codegen/testserver/followschema/enums_test.go

@@ -26,7 +26,7 @@ func TestEnumsResolver(t *testing.T) {
 			enumInInput(input: {enum: OK})
 		}
 		`, &resp)
-		require.Equal(t, resp.EnumInInput, EnumTestOk)
+		require.Equal(t, EnumTestOk, resp.EnumInInput)
 	})
 
 	t.Run("input with invalid enum value", func(t *testing.T) {

codegen/testserver/followschema/mutation_with_custom_scalar_test.go

@@ -30,7 +30,7 @@ func TestErrorInsideMutationArgument(t *testing.T) {
 			&resp,
 			client.Var("input", input),
 		)
-		require.Equal(t, resp["updateSomething"], "Hello world")
+		require.Equal(t, "Hello world", resp["updateSomething"])
 		require.NoError(t, err)
 	})
 

codegen/testserver/followschema/nulls_test.go

@@ -86,7 +86,7 @@ func TestNullBubbling(t *testing.T) {
 		err := c.Post(`query { valid, errorList { id } }`, &resp)
 
 		require.Nil(t, err)
-		require.Equal(t, len(resp.ErrorList), 1)
+		require.Equal(t, 1, len(resp.ErrorList))
 		require.Nil(t, resp.ErrorList[0])
 		require.Equal(t, "Ok", resp.Valid)
 	})

codegen/testserver/followschema/ptr_to_ptr_input_test.go

@@ -77,14 +77,14 @@ func TestPtrToPtr(t *testing.T) {
 		err := c.Post(`mutation { updatePtrToPtr(input: { name: "newName" }) { name, inner { key, value }, stupidInner { key, value }}}`, &resp)
 		require.NoError(t, err)
 
-		require.Equal(t, resp.UpdatedPtrToPtr.Name, "newName")
+		require.Equal(t, "newName", resp.UpdatedPtrToPtr.Name)
 		require.NotNil(t, resp.UpdatedPtrToPtr.Inner)
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Key, "oldKey")
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Value, "oldValue")
+		require.Equal(t, "oldKey", resp.UpdatedPtrToPtr.Inner.Key)
+		require.Equal(t, "oldValue", resp.UpdatedPtrToPtr.Inner.Value)
 		require.NotNil(t, resp.UpdatedPtrToPtr.StupidInner)
 		require.NotNil(t, ******resp.UpdatedPtrToPtr.StupidInner)
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Key, "oldStupidKey")
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Value, "oldStupidValue")
+		require.Equal(t, "oldStupidKey", (******resp.UpdatedPtrToPtr.StupidInner).Key)
+		require.Equal(t, "oldStupidValue", (******resp.UpdatedPtrToPtr.StupidInner).Value)
 	})
 
 	t.Run("pointer to pointer input non-null", func(t *testing.T) {
@@ -101,14 +101,14 @@ func TestPtrToPtr(t *testing.T) {
 		}`, &resp)
 		require.NoError(t, err)
 
-		require.Equal(t, resp.UpdatedPtrToPtr.Name, "oldName")
+		require.Equal(t, "oldName", resp.UpdatedPtrToPtr.Name)
 		require.NotNil(t, resp.UpdatedPtrToPtr.Inner)
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Key, "newKey")
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Value, "newValue")
+		require.Equal(t, "newKey", resp.UpdatedPtrToPtr.Inner.Key)
+		require.Equal(t, "newValue", resp.UpdatedPtrToPtr.Inner.Value)
 		require.NotNil(t, resp.UpdatedPtrToPtr.StupidInner)
 		require.NotNil(t, ******resp.UpdatedPtrToPtr.StupidInner)
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Key, "oldStupidKey")
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Value, "oldStupidValue")
+		require.Equal(t, "oldStupidKey", (******resp.UpdatedPtrToPtr.StupidInner).Key)
+		require.Equal(t, "oldStupidValue", (******resp.UpdatedPtrToPtr.StupidInner).Value)
 	})
 
 	t.Run("pointer to pointer input null", func(t *testing.T) {
@@ -117,12 +117,12 @@ func TestPtrToPtr(t *testing.T) {
 		err := c.Post(`mutation { updatePtrToPtr(input: { inner: null }) { name, inner { key, value }, stupidInner { key, value }}}`, &resp)
 		require.NoError(t, err)
 
-		require.Equal(t, resp.UpdatedPtrToPtr.Name, "oldName")
+		require.Equal(t, "oldName", resp.UpdatedPtrToPtr.Name)
 		require.Nil(t, resp.UpdatedPtrToPtr.Inner)
 		require.NotNil(t, resp.UpdatedPtrToPtr.StupidInner)
 		require.NotNil(t, ******resp.UpdatedPtrToPtr.StupidInner)
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Key, "oldStupidKey")
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Value, "oldStupidValue")
+		require.Equal(t, "oldStupidKey", (******resp.UpdatedPtrToPtr.StupidInner).Key)
+		require.Equal(t, "oldStupidValue", (******resp.UpdatedPtrToPtr.StupidInner).Value)
 	})
 
 	t.Run("many pointers input non-null", func(t *testing.T) {
@@ -139,14 +139,14 @@ func TestPtrToPtr(t *testing.T) {
 		}`, &resp)
 		require.NoError(t, err)
 
-		require.Equal(t, resp.UpdatedPtrToPtr.Name, "oldName")
+		require.Equal(t, "oldName", resp.UpdatedPtrToPtr.Name)
 		require.NotNil(t, resp.UpdatedPtrToPtr.Inner)
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Key, "oldKey")
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Value, "oldValue")
+		require.Equal(t, "oldKey", resp.UpdatedPtrToPtr.Inner.Key)
+		require.Equal(t, "oldValue", resp.UpdatedPtrToPtr.Inner.Value)
 		require.NotNil(t, resp.UpdatedPtrToPtr.StupidInner)
 		require.NotNil(t, ******resp.UpdatedPtrToPtr.StupidInner)
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Key, "newKey")
-		require.Equal(t, (******resp.UpdatedPtrToPtr.StupidInner).Value, "newValue")
+		require.Equal(t, "newKey", (******resp.UpdatedPtrToPtr.StupidInner).Key)
+		require.Equal(t, "newValue", (******resp.UpdatedPtrToPtr.StupidInner).Value)
 	})
 
 	t.Run("many pointers input null", func(t *testing.T) {
@@ -155,10 +155,10 @@ func TestPtrToPtr(t *testing.T) {
 		err := c.Post(`mutation { updatePtrToPtr(input: { stupidInner: null }) { name, inner { key, value }, stupidInner { key, value }}}`, &resp)
 		require.NoError(t, err)
 
-		require.Equal(t, resp.UpdatedPtrToPtr.Name, "oldName")
+		require.Equal(t, "oldName", resp.UpdatedPtrToPtr.Name)
 		require.NotNil(t, resp.UpdatedPtrToPtr.Inner)
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Key, "oldKey")
-		require.Equal(t, resp.UpdatedPtrToPtr.Inner.Value, "oldValue")
+		require.Equal(t, "oldKey", resp.UpdatedPtrToPtr.Inner.Key)
+		require.Equal(t, "oldValue", resp.UpdatedPtrToPtr.Inner.Value)
 		require.Nil(t, resp.UpdatedPtrToPtr.StupidInner)
 	})
 }

codegen/testserver/followschema/response_extension_test.go

@@ -30,5 +30,5 @@ func TestResponseExtension(t *testing.T) {
 	c := client.New(srv)
 
 	raw, _ := c.RawPost(`query { valid }`)
-	require.Equal(t, raw.Extensions["example"], "value")
+	require.Equal(t, "value", raw.Extensions["example"])
 }

codegen/testserver/followschema/v-ok_test.go

@@ -31,7 +31,7 @@ func TestOk(t *testing.T) {
 		}
 		err := c.Post(`query { vOkCaseValue { value } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.VOkCaseValue.Value, "hi")
+		require.Equal(t, "hi", resp.VOkCaseValue.Value)
 	})
 
 	t.Run("v ok case nil", func(t *testing.T) {

codegen/testserver/singlefile/defaults_test.go

@@ -13,9 +13,9 @@ import (
 func assertDefaults(t *testing.T, ret *DefaultParametersMirror) {
 	require.NotNil(t, ret)
 	require.NotNil(t, ret.FalsyBoolean)
-	require.Equal(t, *ret.FalsyBoolean, false)
+	require.Equal(t, false, *ret.FalsyBoolean)
 	require.NotNil(t, ret.TruthyBoolean)
-	require.Equal(t, *ret.TruthyBoolean, true)
+	require.Equal(t, true, *ret.TruthyBoolean)
 }
 
 func TestDefaults(t *testing.T) {

codegen/testserver/singlefile/defer_test.go

@@ -238,9 +238,9 @@ func TestDefer(t *testing.T) {
 			}
 		}
 
-		assert.Equal(t, valuesByPath["deferCase2.0"], []string{"test defer 1", "test defer 2", "test defer 3"})
-		assert.Equal(t, valuesByPath["deferCase2.1"], []string{"test defer 1", "test defer 2", "test defer 3"})
-		assert.Equal(t, valuesByPath["deferCase2.2"], []string{"test defer 1", "test defer 2", "test defer 3"})
+		assert.Equal(t, []string{"test defer 1", "test defer 2", "test defer 3"}, valuesByPath["deferCase2.0"])
+		assert.Equal(t, []string{"test defer 1", "test defer 2", "test defer 3"}, valuesByPath["deferCase2.1"])
+		assert.Equal(t, []string{"test defer 1", "test defer 2", "test defer 3"}, valuesByPath["deferCase2.2"])
 
 		for i := range resp.Data.DeferCase2 {
 			resp.Data.DeferCase2[i].Values = valuesByPath["deferCase2."+strconv.FormatInt(int64(i), 10)]

codegen/testserver/singlefile/directive_test.go

@@ -301,7 +301,7 @@ func TestDirectives(t *testing.T) {
 
 			c.MustPost(`query { directiveField@logged(id:"testes_id") }`, &resp)
 
-			require.Equal(t, resp.DirectiveField, `testes_id`)
+			require.Equal(t, `testes_id`, resp.DirectiveField)
 		})
 		t.Run("without field directive", func(t *testing.T) {
 			var resp struct {

codegen/testserver/singlefile/embedded_test.go

@@ -40,7 +40,7 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase1 { exportedEmbeddedPointerExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase1.ExportedEmbeddedPointerExportedMethod, "ExportedEmbeddedPointerExportedMethodResponse")
+		require.Equal(t, "ExportedEmbeddedPointerExportedMethodResponse", resp.EmbeddedCase1.ExportedEmbeddedPointerExportedMethod)
 	})
 
 	t.Run("embedded case 2", func(t *testing.T) {
@@ -51,7 +51,7 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase2 { unexportedEmbeddedPointerExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase2.UnexportedEmbeddedPointerExportedMethod, "UnexportedEmbeddedPointerExportedMethodResponse")
+		require.Equal(t, "UnexportedEmbeddedPointerExportedMethodResponse", resp.EmbeddedCase2.UnexportedEmbeddedPointerExportedMethod)
 	})
 
 	t.Run("embedded case 3", func(t *testing.T) {
@@ -62,6 +62,6 @@ func TestEmbedded(t *testing.T) {
 		}
 		err := c.Post(`query { embeddedCase3 { unexportedEmbeddedInterfaceExportedMethod } }`, &resp)
 		require.NoError(t, err)
-		require.Equal(t, resp.EmbeddedCase3.UnexportedEmbeddedInterfaceExportedMethod, "UnexportedEmbeddedInterfaceExportedMethod")
+		require.Equal(t, "UnexportedEmbeddedInterfaceExportedMethod", resp.EmbeddedCase3.UnexportedEmbeddedInterfaceExportedMethod)
 	})
 }

codegen/testserver/singlefile/enums_test.go

@@ -26,7 +26,7 @@ func TestEnumsResolver(t *testing.T) {
 			enumInInput(input: {enum: OK})
 		}
 		`, &resp)
-		require.Equal(t, resp.EnumInInput, EnumTestOk)
+		require.Equal(t, EnumTestOk, resp.EnumInInput)
 	})
 
 	t.Run("input with invalid enum value", func(t *testing.T) {

codegen/testserver/singlefile/mutation_with_custom_scalar_test.go

@@ -30,7 +30,7 @@ func TestErrorInsideMutationArgument(t *testing.T) {
 			&resp,
 			client.Var("input", input),
 		)
-		require.Equal(t, resp["updateSomething"], "Hello world")
+		require.Equal(t, "Hello world", resp["updateSomething"])
 		require.NoError(t, err)
 	})