Improve filter tests by verifying image names

Signed-off-by: Jan Rodák <hony.com@seznam.cz>

Author: Honny1

libimage/filters_test.go

@@ -40,51 +40,74 @@ func TestFilterReference(t *testing.T) {
 	require.NoError(t, err)
 	err = alpine.Tag("docker.io/library/image:another-tag")
 	require.NoError(t, err)
+	err = alpine.Tag("docker.io/library/image:latest")
+	require.NoError(t, err)
+
+	allAlpineNames := []string{
+		"docker.io/library/image:another-tag",
+		"quay.io/libpod/alpine:latest",
+		"localhost/another-image:tag",
+		"docker.io/library/image:latest",
+	}
+	allBusyBoxNames := []string{
+		"quay.io/libpod/busybox:latest",
+		"localhost/image:tag",
+	}
+	allNames := []string{}
+	allNames = append(allNames, allBusyBoxNames...)
+	allNames = append(allNames, allAlpineNames...)
 
 	for _, test := range []struct {
-		filters []string
-		matches int
+		filters       []string
+		matchedImages int
+		names         []string
 	}{
-		{[]string{"image"}, 2},
-		{[]string{"*mage*"}, 2},
-		{[]string{"image:*"}, 2},
-		{[]string{"image:tag"}, 1},
-		{[]string{"image:another-tag"}, 1},
-		{[]string{"localhost/image"}, 1},
-		{[]string{"localhost/image:tag"}, 1},
-		{[]string{"library/image"}, 1},
-		{[]string{"docker.io/library/image*"}, 1},
-		{[]string{"docker.io/library/image:*"}, 1},
-		{[]string{"docker.io/library/image:another-tag"}, 1},
-		{[]string{"localhost/*"}, 2},
-		{[]string{"localhost/image:*tag"}, 1},
-		{[]string{"localhost/*mage:*ag"}, 2},
-		{[]string{"quay.io/libpod/busybox"}, 1},
-		{[]string{"quay.io/libpod/alpine"}, 1},
-		{[]string{"quay.io/libpod"}, 0},
-		{[]string{"quay.io/libpod/*"}, 2},
-		{[]string{"busybox"}, 1},
-		{[]string{"alpine"}, 1},
-		{[]string{"alpine@" + alpine.Digest().String()}, 1},
-		{[]string{"alpine:latest@" + alpine.Digest().String()}, 1},
-		{[]string{"quay.io/libpod/alpine@" + alpine.Digest().String()}, 1},
-		{[]string{"quay.io/libpod/alpine:latest@" + alpine.Digest().String()}, 1},
+		{[]string{"image"}, 2, allNames},
+		{[]string{"*mage*"}, 2, allNames},
+		{[]string{"image:*"}, 2, allNames},
+		{[]string{"image:tag"}, 1, allBusyBoxNames},
+		{[]string{"image:another-tag"}, 1, allAlpineNames},
+		{[]string{"localhost/image"}, 1, allBusyBoxNames},
+		{[]string{"localhost/image:tag"}, 1, allBusyBoxNames},
+		{[]string{"library/image"}, 1, allAlpineNames},
+		{[]string{"docker.io/library/image*"}, 1, allAlpineNames},
+		{[]string{"docker.io/library/image:*"}, 1, allAlpineNames},
+		{[]string{"docker.io/library/image:another-tag"}, 1, allAlpineNames},
+		{[]string{"localhost/*"}, 2, allNames},
+		{[]string{"localhost/image:*tag"}, 1, allBusyBoxNames},
+		{[]string{"localhost/*mage:*ag"}, 2, allNames},
+		{[]string{"quay.io/libpod/busybox"}, 1, allBusyBoxNames},
+		{[]string{"quay.io/libpod/alpine"}, 1, allAlpineNames},
+		{[]string{"quay.io/libpod"}, 0, []string{}},
+		{[]string{"quay.io/libpod/*"}, 2, allNames},
+		{[]string{"busybox"}, 1, allBusyBoxNames},
+		{[]string{"alpine"}, 1, allAlpineNames},
+
 		// Make sure negate works as expected
-		{[]string{"!alpine"}, 1},
-		{[]string{"!alpine", "!busybox"}, 0},
-		{[]string{"!alpine", "busybox"}, 1},
-		{[]string{"alpine", "busybox"}, 2},
-		{[]string{"*test", "!*box"}, 1},
+		{[]string{"!alpine"}, 1, allBusyBoxNames},
+		{[]string{"!alpine", "!busybox"}, 0, []string{}},
+		{[]string{"!alpine", "busybox"}, 1, allBusyBoxNames},
+		{[]string{"alpine", "busybox"}, 2, allNames},
+		{[]string{"*test", "!*box"}, 1, allAlpineNames},
+
+		{[]string{"quay.io/libpod/alpine@" + alpine.Digest().String()}, 1, allAlpineNames},
+
+		{[]string{"alpine@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"alpine:latest@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"quay.io/libpod/alpine:latest@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"docker.io/library/image@" + alpine.Digest().String()}, 1, allAlpineNames},
+
 		// Make sure that tags are ignored
-		{[]string{"alpine:ignoreme@" + alpine.Digest().String()}, 1},
-		{[]string{"alpine:123@" + alpine.Digest().String()}, 1},
-		{[]string{"quay.io/libpod/alpine:hurz@" + alpine.Digest().String()}, 1},
-		{[]string{"quay.io/libpod/alpine:456@" + alpine.Digest().String()}, 1},
+		{[]string{"alpine:ignoreme@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"alpine:123@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"quay.io/libpod/alpine:hurz@" + alpine.Digest().String()}, 1, allAlpineNames},
+		{[]string{"quay.io/libpod/alpine:456@" + alpine.Digest().String()}, 1, allAlpineNames},
+
 		// Make sure that repo and digest must match
-		{[]string{"alpine:busyboxdigest@" + busybox.Digest().String()}, 0},
-		{[]string{"alpine:busyboxdigest@" + busybox.Digest().String()}, 0},
-		{[]string{"quay.io/libpod/alpine:busyboxdigest@" + busybox.Digest().String()}, 0},
-		{[]string{"quay.io/libpod/alpine:busyboxdigest@" + busybox.Digest().String()}, 0},
+		{[]string{"alpine:busyboxdigest@" + busybox.Digest().String()}, 0, []string{}},
+		{[]string{"alpine:busyboxdigest@" + busybox.Digest().String()}, 0, []string{}},
+		{[]string{"quay.io/libpod/alpine:busyboxdigest@" + busybox.Digest().String()}, 0, []string{}},
+		{[]string{"quay.io/libpod/alpine:busyboxdigest@" + busybox.Digest().String()}, 0, []string{}},
 	} {
 		var filters []string
 		for _, filter := range test.filters {
@@ -94,12 +117,20 @@ func TestFilterReference(t *testing.T) {
 				filters = append(filters, "reference="+filter)
 			}
 		}
+
 		listOptions := &ListImagesOptions{
 			Filters: filters,
 		}
 		listedImages, err := runtime.ListImages(ctx, listOptions)
+
 		require.NoError(t, err, "%v", test)
-		require.Len(t, listedImages, test.matches, "%s -> %v", test.filters, listedImages)
+		require.Len(t, listedImages, test.matchedImages, "%s -> %v", test.filters, listedImages)
+
+		resultNames := []string{}
+		for _, image := range listedImages {
+			resultNames = append(resultNames, image.Names()...)
+		}
+		require.ElementsMatch(t, test.names, resultNames, "filters: %s ", test.filters)
 	}
 }