refactored trust revoke command unit tests to use table-driven style

Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>

cli/command/trust/revoke_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/docker/cli/cli/trust"
 	"github.com/docker/cli/internal/test"
 	"github.com/docker/cli/internal/test/notary"
 	"github.com/theupdateframework/notary/client"
@@ -54,85 +55,92 @@ func TestTrustRevokeCommandErrors(t *testing.T) {
 	}
 }
 
-func TestTrustRevokeCommandOfflineErrors(t *testing.T) {
+func TestTrustRevokeCommand(t *testing.T) {
-	cli := test.NewFakeCli(&fakeClient{})
+	testCases := []struct {
-	cli.SetNotaryClient(notary.GetOfflineNotaryRepository)
+		doc              string
-	cmd := newRevokeCommand(cli)
+		notaryRepository func(trust.ImageRefAndAuth, []string) (client.Repository, error)
-	cmd.SetArgs([]string{"reg-name.io/image"})
+		args             []string
-	cmd.SetOutput(ioutil.Discard)
+		expectedErr      string
-	assert.NilError(t, cmd.Execute())
+		expectedMessage  string
-	assert.Check(t, is.Contains(cli.OutBuffer().String(), "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action."))
+	}{
-
+		{
-	cli = test.NewFakeCli(&fakeClient{})
+			doc:              "OfflineErrors_Confirm",
-	cli.SetNotaryClient(notary.GetOfflineNotaryRepository)
+			notaryRepository: notary.GetOfflineNotaryRepository,
-	cmd = newRevokeCommand(cli)
+			args:             []string{"reg-name.io/image"},
-	cmd.SetArgs([]string{"reg-name.io/image", "-y"})
+			expectedMessage:  "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action.",
-	cmd.SetOutput(ioutil.Discard)
+		},
-
+		{
-	cli = test.NewFakeCli(&fakeClient{})
+			doc:              "OfflineErrors_Offline",
-	cli.SetNotaryClient(notary.GetOfflineNotaryRepository)
+			notaryRepository: notary.GetOfflineNotaryRepository,
-	cmd = newRevokeCommand(cli)
+			args:             []string{"reg-name.io/image", "-y"},
-	cmd.SetArgs([]string{"reg-name.io/image:tag"})
+			expectedErr:      "could not remove signature for reg-name.io/image: client is offline",
-	cmd.SetOutput(ioutil.Discard)
+		},
-	assert.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image:tag: client is offline")
+		{
+			doc:              "OfflineErrors_WithTag_Offline",
+			notaryRepository: notary.GetOfflineNotaryRepository,
+			args:             []string{"reg-name.io/image:tag"},
+			expectedErr:      "could not remove signature for reg-name.io/image:tag: client is offline",
+		},
+		{
+			doc:              "UninitializedErrors_Confirm",
+			notaryRepository: notary.GetUninitializedNotaryRepository,
+			args:             []string{"reg-name.io/image"},
+			expectedMessage:  "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action.",
+		},
+		{
+			doc:              "UninitializedErrors_NoTrustData",
+			notaryRepository: notary.GetUninitializedNotaryRepository,
+			args:             []string{"reg-name.io/image", "-y"},
+			expectedErr:      "could not remove signature for reg-name.io/image:  does not have trust data for",
+		},
+		{
+			doc:              "UninitializedErrors_WithTag_NoTrustData",
+			notaryRepository: notary.GetUninitializedNotaryRepository,
+			args:             []string{"reg-name.io/image:tag"},
+			expectedErr:      "could not remove signature for reg-name.io/image:tag:  does not have trust data for",
+		},
+		{
+			doc:              "EmptyNotaryRepo_Confirm",
+			notaryRepository: notary.GetEmptyTargetsNotaryRepository,
+			args:             []string{"reg-name.io/image"},
+			expectedMessage:  "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action.",
+		},
+		{
+			doc:              "EmptyNotaryRepo_NoSignedTags",
+			notaryRepository: notary.GetEmptyTargetsNotaryRepository,
+			args:             []string{"reg-name.io/image", "-y"},
+			expectedErr:      "could not remove signature for reg-name.io/image: no signed tags to remove",
+		},
+		{
+			doc:              "EmptyNotaryRepo_NoValidTrustData",
+			notaryRepository: notary.GetEmptyTargetsNotaryRepository,
+			args:             []string{"reg-name.io/image:tag"},
+			expectedErr:      "could not remove signature for reg-name.io/image:tag: No valid trust data for tag",
+		},
+		{
+			doc:              "AllSigConfirmation",
+			notaryRepository: notary.GetEmptyTargetsNotaryRepository,
+			args:             []string{"alpine"},
+			expectedMessage:  "Please confirm you would like to delete all signature data for alpine? [y/N] \nAborting action.",
+		},
 	}
 
-func TestTrustRevokeCommandUninitializedErrors(t *testing.T) {
+	for _, tc := range testCases {
+		t.Run(tc.doc, func(t *testing.T) {
 			cli := test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetUninitializedNotaryRepository)
+			cli.SetNotaryClient(tc.notaryRepository)
 			cmd := newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image"})
+			cmd.SetArgs(tc.args)
 			cmd.SetOutput(ioutil.Discard)
+			if tc.expectedErr != "" {
+				assert.ErrorContains(t, cmd.Execute(), tc.expectedErr)
+				return
+			}
 			assert.NilError(t, cmd.Execute())
-	assert.Check(t, is.Contains(cli.OutBuffer().String(), "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action."))
+			assert.Check(t, is.Contains(cli.OutBuffer().String(), tc.expectedMessage))
-
+		})
-	cli = test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetUninitializedNotaryRepository)
-	cmd = newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image", "-y"})
-	cmd.SetOutput(ioutil.Discard)
-	assert.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image:  does not have trust data for")
-
-	cli = test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetUninitializedNotaryRepository)
-	cmd = newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image:tag"})
-	cmd.SetOutput(ioutil.Discard)
-	assert.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image:tag:  does not have trust data for")
 	}
 
-func TestTrustRevokeCommandEmptyNotaryRepo(t *testing.T) {
-	cli := test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetEmptyTargetsNotaryRepository)
-	cmd := newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image"})
-	cmd.SetOutput(ioutil.Discard)
-	assert.NilError(t, cmd.Execute())
-	assert.Check(t, is.Contains(cli.OutBuffer().String(), "Please confirm you would like to delete all signature data for reg-name.io/image? [y/N] \nAborting action."))
-
-	cli = test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetEmptyTargetsNotaryRepository)
-	cmd = newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image", "-y"})
-	cmd.SetOutput(ioutil.Discard)
-	assert.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image: no signed tags to remove")
-
-	cli = test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetEmptyTargetsNotaryRepository)
-	cmd = newRevokeCommand(cli)
-	cmd.SetArgs([]string{"reg-name.io/image:tag"})
-	cmd.SetOutput(ioutil.Discard)
-	assert.ErrorContains(t, cmd.Execute(), "could not remove signature for reg-name.io/image:tag: No valid trust data for tag")
-}
-
-func TestNewRevokeTrustAllSigConfirmation(t *testing.T) {
-	cli := test.NewFakeCli(&fakeClient{})
-	cli.SetNotaryClient(notary.GetEmptyTargetsNotaryRepository)
-	cmd := newRevokeCommand(cli)
-	cmd.SetArgs([]string{"alpine"})
-	assert.NilError(t, cmd.Execute())
-
-	assert.Check(t, is.Contains(cli.OutBuffer().String(), "Please confirm you would like to delete all signature data for alpine? [y/N] \nAborting action."))
 }
 
 func TestGetSignableRolesForTargetAndRemoveError(t *testing.T) {