Merge pull request #16 from oalders/refactor-tests

Refactor some tests

Author: oalders

api.go

@@ -61,6 +61,11 @@ type UserCmd struct {
 	Sudoer string `arg:"" required:"" default:"sudoer" enum:"sudoer" help:"is current user a passwordless sudoer. e.g. \"is user sudoer\""`
 }
 
+type KnownCLI struct {
+	Attr string `arg:"" name:"attribute" required:"" enum:"version"`
+	Name string `arg:"" required:""`
+}
+
 // KnownCmd type is configuration for printing environment info.
 //
 //nolint:lll
@@ -71,13 +76,10 @@ type KnownCmd struct {
 	OS struct {
 		Attr string `arg:"" required:"" name:"attribute" help:"[id|id-like|pretty-name|name|version|version-codename]"`
 	} `cmd:"" help:"Print without check. e.g. \"is known os name\""`
-	CLI struct {
-		Attr string `arg:"" name:"attribute" required:"" enum:"version"`
-		Name string `arg:"" required:""`
-	} `cmd:"" help:"Print without check. e.g. \"is known cli version git\""`
-	Major bool `xor:"Major,Minor,Patch" help:"Only print the major OS or CLI version (e.g. major.minor.patch)"`
-	Minor bool `xor:"Major,Minor,Patch" help:"Only print the minor OS or CLI version (e.g. major.minor.patch)"`
-	Patch bool `xor:"Major,Minor,Patch" help:"Only print the patch OS or CLI version (e.g. major.minor.patch)"`
+	CLI   KnownCLI `cmd:"" help:"Print without check. e.g. \"is known cli version git\""`
+	Major bool     `xor:"Major,Minor,Patch" help:"Only print the major OS or CLI version (e.g. major.minor.patch)"`
+	Minor bool     `xor:"Major,Minor,Patch" help:"Only print the minor OS or CLI version (e.g. major.minor.patch)"`
+	Patch bool     `xor:"Major,Minor,Patch" help:"Only print the patch OS or CLI version (e.g. major.minor.patch)"`
 }
 
 // ThereCmd is configuration for finding executables.

known_test.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"runtime"
 	"testing"
 
@@ -12,109 +13,85 @@ import (
 func TestKnownCmd(t *testing.T) {
 	t.Parallel()
 	const tmux = "testdata/bin/tmux"
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.OS.Attr = attr.Name
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success)
-	}
-	if runtime.GOOS == "darwin" {
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.OS.Attr = attr.Version
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success)
-	}
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.OS.Attr = attr.Version
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success)
+	type testableOS struct {
+		Attr    string
+		Error   bool
+		Success bool
 	}
 
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.OS.Attr = "tmuxxx"
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.False(t, ctx.Success, "No success")
+	osTests := []testableOS{
+		{attr.Name, false, true},
+		{attr.Version, false, true},
+		{"tmuxxx", false, false},
+		{"tmuxxx", false, false},
 	}
 
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Version
-		cmd.CLI.Name = "gitzzz"
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.False(t, ctx.Success, "No success")
+	if runtime.GOOS == "darwin" {
+		osTests = append(osTests, testableOS{attr.Version, false, true})
 	}
 
-	{
+	for _, test := range osTests {
 		ctx := types.Context{Debug: true}
 		cmd := KnownCmd{}
-		cmd.Arch.Attr = "arch"
+		cmd.OS.Attr = test.Attr
 		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success, "success")
+		name := fmt.Sprintf("%s err: %t success: %t", test.Attr, test.Error, test.Success)
+		if test.Error {
+			assert.Error(t, err, name)
+		} else {
+			assert.NoError(t, err, name)
+		}
+		if test.Success {
+			assert.True(t, ctx.Success, name)
+		} else {
+			assert.False(t, ctx.Success, name)
+		}
 	}
 
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Version
-		cmd.CLI.Name = tmux
-		cmd.Major = true
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success, "success")
+	type testableCLI struct {
+		Cmd     KnownCmd
+		Error   bool
+		Success bool
 	}
-
-	{
-		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Version
-		cmd.CLI.Name = tmux
-		cmd.Minor = true
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success, "success")
+	cliTests := []testableCLI{
+		{KnownCmd{CLI: KnownCLI{attr.Version, "gitzzz"}}, false, false},
+		{KnownCmd{CLI: KnownCLI{attr.Version, tmux}}, false, true},
+		{KnownCmd{CLI: KnownCLI{attr.Version, tmux}, Major: true}, false, true},
+		{KnownCmd{CLI: KnownCLI{attr.Version, tmux}, Minor: true}, false, true},
+		{KnownCmd{CLI: KnownCLI{attr.Version, tmux}, Patch: true}, false, true},
 	}
 
-	{
+	for _, test := range cliTests {
 		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Version
-		cmd.CLI.Name = tmux
-		cmd.Patch = true
-		err := cmd.Run(&ctx)
-		assert.NoError(t, err)
-		assert.True(t, ctx.Success, "success")
+		err := test.Cmd.Run(&ctx)
+
+		switch test.Error {
+		case true:
+			assert.Error(t, err)
+		default:
+			assert.NoError(t, err)
+		}
+
+		switch test.Success {
+		case true:
+			assert.True(t, ctx.Success)
+		default:
+			assert.False(t, ctx.Success)
+		}
 	}
 
 	{
 		ctx := types.Context{Debug: true}
 		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Version
-		cmd.CLI.Name = tmux
-		cmd.Major = true
+		cmd.Arch.Attr = "arch"
 		err := cmd.Run(&ctx)
 		assert.NoError(t, err)
 		assert.True(t, ctx.Success, "success")
 	}
-
 	{
 		ctx := types.Context{Debug: true}
-		cmd := KnownCmd{}
-		cmd.CLI.Attr = attr.Name
-		cmd.CLI.Name = tmux
-		cmd.Major = true
+		cmd := KnownCmd{Major: true}
+		cmd.OS.Attr = "name"
 		err := cmd.Run(&ctx)
 		assert.Error(t, err)
 		assert.False(t, ctx.Success, "success")