Fix image querying (#2119)

* Fix image querying
* Add unit tests

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
InfiniteTF
2021-12-15 03:56:03 +01:00
committed by GitHub
parent d176e9f192
commit b58883c074
3 changed files with 13 additions and 16 deletions

View File

@@ -490,6 +490,8 @@ func TestImageQueryIsMissingGalleries(t *testing.T) {
t.Errorf("Error querying image: %s", err.Error())
}
assert.Greater(t, len(images), 0)
// ensure non of the ids equal the one with gallery
for _, image := range images {
assert.NotEqual(t, imageIDs[imageIdxWithGallery], image.ID)
@@ -641,11 +643,7 @@ func TestImageQueryGallery(t *testing.T) {
Galleries: &galleryCriterion,
}
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
images := queryImages(t, sqb, &imageFilter, nil)
assert.Len(t, images, 1)
// ensure ids are correct
@@ -661,10 +659,7 @@ func TestImageQueryGallery(t *testing.T) {
Modifier: models.CriterionModifierIncludesAll,
}
images, _, err = queryImagesWithCount(sqb, &imageFilter, nil)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
images = queryImages(t, sqb, &imageFilter, nil)
assert.Len(t, images, 1)
assert.Equal(t, imageIDs[imageIdxWithTwoGalleries], images[0].ID)
@@ -681,12 +676,13 @@ func TestImageQueryGallery(t *testing.T) {
Q: &q,
}
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
images = queryImages(t, sqb, &imageFilter, &findFilter)
assert.Len(t, images, 0)
q = getImageStringValue(imageIdxWithPerformer, titleField)
images = queryImages(t, sqb, &imageFilter, &findFilter)
assert.Len(t, images, 1)
return nil
})
}