Skip to content

Commit 2bc7574

Browse files
committed
TEST/MINOR: compare: changing generation to accomodate interface{}
1 parent 788069d commit 2bc7574

File tree

136 files changed

+1151
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1151
-1007
lines changed

cmd/struct_equal_generator/generate.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ func generateEqualAndDiff(opt generateEqualAndDiffOptions) error {
5353
}
5454

5555
func generateCompareTests(opt generateEqualAndDiffOptions) error {
56+
var metadataIndex int
57+
for i, f := range opt.Fields {
58+
if f.Name == "Metadata" {
59+
metadataIndex = i
60+
break
61+
}
62+
}
63+
if metadataIndex > 0 {
64+
opt.Fields = append(opt.Fields[:metadataIndex], opt.Fields[metadataIndex+1:]...)
65+
}
5666
if opt.Mode == "array" {
5767
return nil
5868
}

cmd/struct_equal_generator/header.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"encoding/gob"
1717

1818
"github.com/go-faker/faker/v4"
19+
"github.com/go-faker/faker/v4/pkg/options"
1920
"github.com/go-openapi/strfmt"
2021

2122
jsoniter "github.com/json-iterator/go"

cmd/struct_equal_generator/test.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ func Test{{$.Name}}{{.}}(t *testing.T) {
77
for i := 0; i < 2; i++ {
88
var sample {{$.Name}}
99
var result {{$.Name}}
10-
err := faker.FakeData(&sample)
10+
err := faker.FakeData(&sample, options.WithIgnoreInterface(true))
1111
if err != nil {
1212
t.Errorf(err.Error())
1313
}
@@ -62,11 +62,11 @@ func Test{{$.Name}}{{.}}False(t *testing.T) {
6262
for i := 0; i < 2; i++ {
6363
var sample {{$.Name}}
6464
var result {{$.Name}}
65-
err := faker.FakeData(&sample)
65+
err := faker.FakeData(&sample, options.WithIgnoreInterface(true))
6666
if err != nil {
6767
t.Errorf(err.Error())
6868
}
69-
err = faker.FakeData(&result)
69+
err = faker.FakeData(&result, options.WithIgnoreInterface(true))
7070
if err != nil {
7171
t.Errorf(err.Error())
7272
}

models/acl_compare_test.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/acl_file_compare_test.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/acl_file_entry_compare_test.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/aws_filters_compare_test.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/aws_region_compare_test.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)