From 46fc38bf612bcc0d9b4a465990ce04ba830cf814 Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 5 Jun 2024 19:42:46 -0400 Subject: [PATCH] Fix tests expectations --- core/agents/agents_test.go | 28 ++++++++++++++-------------- model/criteria/criteria_test.go | 2 +- model/criteria/operators_test.go | 2 +- utils/slice/slice_test.go | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/agents/agents_test.go b/core/agents/agents_test.go index 33687048..d61d63f7 100644 --- a/core/agents/agents_test.go +++ b/core/agents/agents_test.go @@ -60,7 +60,7 @@ var _ = Describe("Agents", func() { Describe("GetArtistMBID", func() { It("returns on first match", func() { Expect(ag.GetArtistMBID(ctx, "123", "test")).To(Equal("mbid")) - Expect(mock.Args).To(ConsistOf("123", "test")) + Expect(mock.Args).To(HaveExactElements("123", "test")) }) It("returns empty if artist is Various Artists", func() { mbid, err := ag.GetArtistMBID(ctx, consts.VariousArtistsID, consts.VariousArtists) @@ -78,7 +78,7 @@ var _ = Describe("Agents", func() { mock.Err = errors.New("error") _, err := ag.GetArtistMBID(ctx, "123", "test") Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("123", "test")) + Expect(mock.Args).To(HaveExactElements("123", "test")) }) It("interrupts if the context is canceled", func() { cancel() @@ -91,7 +91,7 @@ var _ = Describe("Agents", func() { Describe("GetArtistURL", func() { It("returns on first match", func() { Expect(ag.GetArtistURL(ctx, "123", "test", "mb123")).To(Equal("url")) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("returns empty if artist is Various Artists", func() { url, err := ag.GetArtistURL(ctx, consts.VariousArtistsID, consts.VariousArtists, "") @@ -109,7 +109,7 @@ var _ = Describe("Agents", func() { mock.Err = errors.New("error") _, err := ag.GetArtistURL(ctx, "123", "test", "mb123") Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("interrupts if the context is canceled", func() { cancel() @@ -122,7 +122,7 @@ var _ = Describe("Agents", func() { Describe("GetArtistBiography", func() { It("returns on first match", func() { Expect(ag.GetArtistBiography(ctx, "123", "test", "mb123")).To(Equal("bio")) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("returns empty if artist is Various Artists", func() { bio, err := ag.GetArtistBiography(ctx, consts.VariousArtistsID, consts.VariousArtists, "") @@ -140,7 +140,7 @@ var _ = Describe("Agents", func() { mock.Err = errors.New("error") _, err := ag.GetArtistBiography(ctx, "123", "test", "mb123") Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("interrupts if the context is canceled", func() { cancel() @@ -156,13 +156,13 @@ var _ = Describe("Agents", func() { URL: "imageUrl", Size: 100, }})) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("skips the agent if it returns an error", func() { mock.Err = errors.New("error") _, err := ag.GetArtistImages(ctx, "123", "test", "mb123") Expect(err).To(MatchError("not found")) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123")) }) It("interrupts if the context is canceled", func() { cancel() @@ -178,13 +178,13 @@ var _ = Describe("Agents", func() { Name: "Joe Dohn", MBID: "mbid321", }})) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 1)) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 1)) }) It("skips the agent if it returns an error", func() { mock.Err = errors.New("error") _, err := ag.GetSimilarArtists(ctx, "123", "test", "mb123", 1) Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 1)) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 1)) }) It("interrupts if the context is canceled", func() { cancel() @@ -200,13 +200,13 @@ var _ = Describe("Agents", func() { Name: "A Song", MBID: "mbid444", }})) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 2)) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 2)) }) It("skips the agent if it returns an error", func() { mock.Err = errors.New("error") _, err := ag.GetArtistTopSongs(ctx, "123", "test", "mb123", 2) Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("123", "test", "mb123", 2)) + Expect(mock.Args).To(HaveExactElements("123", "test", "mb123", 2)) }) It("interrupts if the context is canceled", func() { cancel() @@ -236,13 +236,13 @@ var _ = Describe("Agents", func() { }, }, })) - Expect(mock.Args).To(ConsistOf("album", "artist", "mbid")) + Expect(mock.Args).To(HaveExactElements("album", "artist", "mbid")) }) It("skips the agent if it returns an error", func() { mock.Err = errors.New("error") _, err := ag.GetAlbumInfo(ctx, "album", "artist", "mbid") Expect(err).To(MatchError(ErrNotFound)) - Expect(mock.Args).To(ConsistOf("album", "artist", "mbid")) + Expect(mock.Args).To(HaveExactElements("album", "artist", "mbid")) }) It("interrupts if the context is canceled", func() { cancel() diff --git a/model/criteria/criteria_test.go b/model/criteria/criteria_test.go index 3b004b51..6b492622 100644 --- a/model/criteria/criteria_test.go +++ b/model/criteria/criteria_test.go @@ -65,7 +65,7 @@ var _ = Describe("Criteria", func() { sql, args, err := goObj.ToSql() gomega.Expect(err).ToNot(gomega.HaveOccurred()) gomega.Expect(sql).To(gomega.Equal("(media_file.title LIKE ? AND media_file.title NOT LIKE ? AND (media_file.artist <> ? OR media_file.album = ?) AND (media_file.comment LIKE ? AND (media_file.year >= ? AND media_file.year <= ?) AND COALESCE(genre.name, '') <> ?))")) - gomega.Expect(args).To(gomega.ConsistOf("%love%", "%hate%", "u2", "best of", "this%", 1980, 1990, "test")) + gomega.Expect(args).To(gomega.HaveExactElements("%love%", "%hate%", "u2", "best of", "this%", 1980, 1990, "test")) }) It("marshals to JSON", func() { diff --git a/model/criteria/operators_test.go b/model/criteria/operators_test.go index 8fb0a3e6..184510f8 100644 --- a/model/criteria/operators_test.go +++ b/model/criteria/operators_test.go @@ -18,7 +18,7 @@ var _ = Describe("Operators", func() { sql, args, err := op.ToSql() gomega.Expect(err).ToNot(gomega.HaveOccurred()) gomega.Expect(sql).To(gomega.Equal(expectedSql)) - gomega.Expect(args).To(gomega.ConsistOf(expectedArgs...)) + gomega.Expect(args).To(gomega.HaveExactElements(expectedArgs...)) }, Entry("is [string]", Is{"title": "Low Rider"}, "media_file.title = ?", "Low Rider"), Entry("is [bool]", Is{"loved": true}, "COALESCE(annotation.starred, false) = ?", true), diff --git a/utils/slice/slice_test.go b/utils/slice/slice_test.go index 7436a34e..9f6e4d80 100644 --- a/utils/slice/slice_test.go +++ b/utils/slice/slice_test.go @@ -60,13 +60,13 @@ var _ = Describe("Slice Utils", func() { Describe("Move", func() { It("moves item to end of slice", func() { - Expect(slice.Move([]string{"1", "2", "3"}, 0, 2)).To(ConsistOf("2", "3", "1")) + Expect(slice.Move([]string{"1", "2", "3"}, 0, 2)).To(HaveExactElements("2", "3", "1")) }) It("moves item to beginning of slice", func() { - Expect(slice.Move([]string{"1", "2", "3"}, 2, 0)).To(ConsistOf("3", "1", "2")) + Expect(slice.Move([]string{"1", "2", "3"}, 2, 0)).To(HaveExactElements("3", "1", "2")) }) It("keeps item in same position if srcIndex == dstIndex", func() { - Expect(slice.Move([]string{"1", "2", "3"}, 1, 1)).To(ConsistOf("1", "2", "3")) + Expect(slice.Move([]string{"1", "2", "3"}, 1, 1)).To(HaveExactElements("1", "2", "3")) }) }) @@ -80,14 +80,14 @@ var _ = Describe("Slice Utils", func() { s := []string{"a", "b", "c"} chunks := slice.BreakUp(s, 10) Expect(chunks).To(HaveLen(1)) - Expect(chunks[0]).To(ConsistOf("a", "b", "c")) + Expect(chunks[0]).To(HaveExactElements("a", "b", "c")) }) It("breaks up the slice if len > chunkSize", func() { s := []string{"a", "b", "c", "d", "e"} chunks := slice.BreakUp(s, 3) Expect(chunks).To(HaveLen(2)) - Expect(chunks[0]).To(ConsistOf("a", "b", "c")) - Expect(chunks[1]).To(ConsistOf("d", "e")) + Expect(chunks[0]).To(HaveExactElements("a", "b", "c")) + Expect(chunks[1]).To(HaveExactElements("d", "e")) }) }) })