Skip to content

Commit 2fae32b

Browse files
committed
TEST/MINOR: models: keep faked slices and maps non-empty in compare tests
faker sizes slices and maps in [0,100), so a field can be empty in both random samples, compare equal and make DiffFalse tests report one field less than expected. Request at least one element, and report the diff field count that is actually checked in the failure message.
1 parent 640a75e commit 2fae32b

152 files changed

Lines changed: 1724 additions & 958 deletions

File tree

Some content is hidden

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

‎cmd/struct_equal_generator/test.tmpl‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ 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, options.WithIgnoreInterface(true))
65+
// Non-empty slices and maps: if both sides got an empty one, that
66+
// field would compare equal and the diff field count would be short.
67+
err := faker.FakeData(&sample, options.WithIgnoreInterface(true), options.WithRandomMapAndSliceMinSize(1))
6668
if err != nil {
6769
t.Error(err)
6870
}
69-
err = faker.FakeData(&result, options.WithIgnoreInterface(true))
71+
err = faker.FakeData(&result, options.WithIgnoreInterface(true), options.WithRandomMapAndSliceMinSize(1))
7072
if err != nil {
7173
t.Error(err)
7274
}
@@ -134,7 +136,7 @@ func Test{{$.Name}}{{.}}False(t *testing.T) {
134136
t.Errorf("Expected {{$.Name}} to be different, but it is not %s %s", a, b)
135137
{{end -}}
136138
{{- if eq . "Diff" }}
137-
t.Errorf("Expected {{$.Name}} to be different in {{$.FieldCount}} cases, but it is not (%d) %s %s", len(result), a, b)
139+
t.Errorf("Expected {{$.Name}} to be different in {{$.FieldCount}} cases, but it is not (%d) %s %s", {{if $.HasIndex}}len(result){{else}}len(listDiffFields){{end}}, a, b)
138140
{{end -}}
139141
}
140142
}

‎models/acl_compare_test.go‎

Lines changed: 9 additions & 5 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: 9 additions & 5 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: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎models/acme_certificate_status_compare_test.go‎

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

‎models/acme_provider_compare_test.go‎

Lines changed: 9 additions & 5 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: 9 additions & 5 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: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)