From f0479b51639eca3578ce27bfa8fd0c26198f6598 Mon Sep 17 00:00:00 2001 From: theresa Date: Wed, 30 Mar 2022 11:44:25 +0200 Subject: [PATCH] Tests: Refactor unit tests --- internal/search/photos_filter_color_test.go | 14 ++------------ internal/search/photos_filter_country_test.go | 14 ++------------ internal/search/photos_filter_day_test.go | 14 ++------------ internal/search/photos_filter_face_test.go | 14 ++------------ internal/search/photos_filter_faces_test.go | 14 ++------------ internal/search/photos_filter_hash_test.go | 14 ++------------ internal/search/photos_filter_month_test.go | 14 ++------------ internal/search/photos_filter_state_test.go | 14 ++------------ internal/search/photos_filter_type_test.go | 14 ++------------ internal/search/photos_filter_uid_test.go | 14 ++------------ internal/search/photos_filter_year_test.go | 14 ++------------ 11 files changed, 22 insertions(+), 132 deletions(-) diff --git a/internal/search/photos_filter_color_test.go b/internal/search/photos_filter_color_test.go index bf51d58e1..890585411 100644 --- a/internal/search/photos_filter_color_test.go +++ b/internal/search/photos_filter_color_test.go @@ -199,17 +199,12 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photosredorgreen), len(photos)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -458,17 +453,12 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photosredorgreen), len(photos)) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_country_test.go b/internal/search/photos_filter_country_test.go index bea761fcc..5dd317a07 100644 --- a/internal/search/photos_filter_country_test.go +++ b/internal/search/photos_filter_country_test.go @@ -185,17 +185,12 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -430,17 +425,12 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_day_test.go b/internal/search/photos_filter_day_test.go index ec812242e..c4cb7d1cb 100644 --- a/internal/search/photos_filter_day_test.go +++ b/internal/search/photos_filter_day_test.go @@ -190,17 +190,12 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -441,17 +436,12 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_face_test.go b/internal/search/photos_filter_face_test.go index 32f74e998..32ebfb05e 100644 --- a/internal/search/photos_filter_face_test.go +++ b/internal/search/photos_filter_face_test.go @@ -191,17 +191,12 @@ import ( f.Face = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -450,17 +445,12 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_faces_test.go b/internal/search/photos_filter_faces_test.go index 619c6eab2..ccb8b79cc 100644 --- a/internal/search/photos_filter_faces_test.go +++ b/internal/search/photos_filter_faces_test.go @@ -182,17 +182,12 @@ package search f.Faces = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -433,17 +428,12 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_hash_test.go b/internal/search/photos_filter_hash_test.go index 713a4dfba..cc5c627ff 100644 --- a/internal/search/photos_filter_hash_test.go +++ b/internal/search/photos_filter_hash_test.go @@ -185,17 +185,12 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -430,17 +425,12 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_month_test.go b/internal/search/photos_filter_month_test.go index 1ef12078e..0aa15c445 100644 --- a/internal/search/photos_filter_month_test.go +++ b/internal/search/photos_filter_month_test.go @@ -190,17 +190,12 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -441,17 +436,12 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_state_test.go b/internal/search/photos_filter_state_test.go index 45b112eb1..4705cfcf8 100644 --- a/internal/search/photos_filter_state_test.go +++ b/internal/search/photos_filter_state_test.go @@ -189,17 +189,12 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -436,17 +431,12 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_type_test.go b/internal/search/photos_filter_type_test.go index 0780dc0be..ca5676bc1 100644 --- a/internal/search/photos_filter_type_test.go +++ b/internal/search/photos_filter_type_test.go @@ -185,17 +185,12 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -430,17 +425,12 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_uid_test.go b/internal/search/photos_filter_uid_test.go index a5e9ec46e..bb03cbc35 100644 --- a/internal/search/photos_filter_uid_test.go +++ b/internal/search/photos_filter_uid_test.go @@ -185,17 +185,12 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -430,17 +425,12 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { diff --git a/internal/search/photos_filter_year_test.go b/internal/search/photos_filter_year_test.go index 5f17b011a..56249dfa1 100644 --- a/internal/search/photos_filter_year_test.go +++ b/internal/search/photos_filter_year_test.go @@ -190,17 +190,12 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Red|Green" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -441,17 +436,12 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Red|Green\"" f.Merged = true - photos, count, err := Photos(f) + photos, _, err := Photos(f) if err != nil { t.Fatal(err) } - if len(photos) != 1 { - t.Logf("excactly one result expected, but %d photos with %d files found", len(photos), count) - t.Logf("query results: %#v", photos) - } - assert.Equal(t, len(photos), len(photos0)) }) t.Run("EndsWithPipe", func(t *testing.T) {