refactor: deleted gomock and created originals.

Author: en-ken

kadai2/en-ken/cli/cli.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"flag"
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -15,39 +16,39 @@ type CLI struct {
 }
 
 // Execute executes this app according to options
-// arg[0] application name
-// arg[1] input directory
-// arg[2:] options
 func (cli *CLI) Execute(args []string) error {
 
+	var inputExt, outputExt string
 	flags := flag.NewFlagSet(args[0], flag.ExitOnError)
-	var (
-		inputExt  = flags.String("input-ext", ".jpg", "input extension (.jpg/.png)")
-		outputExt = flags.String("output-ext", ".png", "output extension (.jpg/.png)")
-		output    = flags.String("output-dir", args[1], "output directory")
-		inputDir  string
-		outputDir string
-	)
+	flags.StringVar(&inputExt, "in", "jpg", "input extension (jpg/png)")
+	flags.StringVar(&outputExt, "out", "png", "output extension (jpg/png)")
 
-	inputDir, err := filepath.Abs(args[1])
-	if err != nil {
+	// Parse command args
+	if err := flags.Parse(args[1:]); err != nil {
 		return err
 	}
 
-	if err := flags.Parse(args[2:]); err != nil {
+	if len(flags.Args()) != 2 {
+		return fmt.Errorf("Either input directory or output directory not specified")
+	}
+	// Get input dir
+	inputDir, err := filepath.Abs(flags.Arg(0))
+	if err != nil {
 		return err
 	}
-
-	outputDir = *output
-	if outputDir == "" {
-		outputDir = inputDir
+	// Get output dir
+	outputDir, err := filepath.Abs(flags.Arg(1))
+	if err != nil {
+		return err
 	}
 
-	paths, err := cli.AllFilePaths(inputDir, *inputExt)
+	// Get all file paths
+	paths, err := cli.AllFilePaths(inputDir, inputExt)
 	if err != nil {
 		return err
 	}
 
+	// Convert and save
 	for _, path := range paths {
 		img, err := cli.NewImageFIle(path)
 		if err != nil {
@@ -56,7 +57,7 @@ func (cli *CLI) Execute(args []string) error {
 
 		// Copy the hierarchy of the input dir to that of the output dir.
 		outputPath := strings.Replace(img.AbsPath(), inputDir, outputDir, -1)
-		outputPath = strings.Replace(outputPath, *inputExt, *outputExt, 1)
+		outputPath = strings.Replace(outputPath, inputExt, outputExt, 1)
 
 		err = img.SaveAs(outputPath)
 		if err != nil {

kadai2/en-ken/cli/cli_test.go

@@ -5,14 +5,27 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/mock/gomock"
-	"github.com/gopherdojo/dojo6/kadai2/en-ken/mock_imgcnv"
+	"github.com/gopherdojo/dojo6/kadai2/en-ken/imgcnv"
 )
 
-func TestExecuteSuccess(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
+type ImageFileMock struct {
+	t          *testing.T
+	inputPath  string
+	outputPath string
+}
+
+func (mock *ImageFileMock) AbsPath() string {
+	return mock.inputPath
+}
+
+func (mock *ImageFileMock) SaveAs(path string) error {
+	if path != mock.outputPath {
+		mock.t.Errorf("SaveAs was not called correctly:\nactual: %v\nexpected: %v", path, mock.outputPath)
+	}
+	return nil
+}
 
+func TestExecuteSuccess(t *testing.T) {
 	tests := []struct {
 		argString string
 		inputDir  string
@@ -21,75 +34,66 @@ func TestExecuteSuccess(t *testing.T) {
 		outputExt string
 	}{
 		{
-			argString: "./kadai1 ./testdata",
-			inputDir:  "./testdata", inputExt: ".jpg",
-			outputDir: "./testdata", outputExt: ".png",
+			argString: "./kadai1 ./testdata ./out",
+			inputDir:  "./testdata", inputExt: "jpg",
+			outputDir: "./out", outputExt: "png",
 		},
 		{
-			argString: "./kadai1 ./testdata -input-ext .png",
-			inputDir:  "./testdata", inputExt: ".png",
-			outputDir: "./testdata", outputExt: ".png",
+			argString: "./kadai1 -in png ./testdata ./out",
+			inputDir:  "./testdata", inputExt: "png",
+			outputDir: "./out", outputExt: "png",
 		},
 		{
-			argString: "./kadai1 ./testdata -input-ext .png -output-ext .jpg",
-			inputDir:  "./testdata", inputExt: ".png",
-			outputDir: "./testdata", outputExt: ".jpg",
+			argString: "./kadai1 -out jpg ./testdata ./out",
+			inputDir:  "./testdata", inputExt: "jpg",
+			outputDir: "./out", outputExt: "jpg",
 		},
 		{
-			argString: "./kadai1 ./testdata -output-dir ./out",
-			inputDir:  "./testdata", inputExt: ".jpg",
-			outputDir: "./out", outputExt: ".png",
+			argString: "./kadai1 -in png -out jpg ./testdata ./out",
+			inputDir:  "./testdata", inputExt: "png",
+			outputDir: "./out", outputExt: "jpg",
 		},
 	}
 
 	for _, test := range tests {
 		testName := "input: " + test.argString
 		t.Run(testName, func(t *testing.T) {
 
-			mockDirPath := mock_imgcnv.NewMockDirPath(ctrl)
-
 			inputAbsDir, _ := filepath.Abs(test.inputDir)
 			inputPath1 := inputAbsDir + "/test1" + test.inputExt
 			inputPath2 := inputAbsDir + "/test2" + test.inputExt
+			outputPath1, _ := filepath.Abs(test.outputDir + "/test1" + test.outputExt)
+			outputPath2, _ := filepath.Abs(test.outputDir + "/test2" + test.outputExt)
 
-			mockDirPath.
-				EXPECT().
-				AllFilePaths(gomock.Eq(inputAbsDir), gomock.Eq(test.inputExt)).
-				Return([]string{inputPath1, inputPath2}, nil)
-
-			mockImg := mock_imgcnv.NewMockImageFile(ctrl)
-			gomock.InOrder(
-				mockImg.
-					EXPECT().
-					AbsPath().
-					Return(inputPath1),
-				mockImg.
-					EXPECT().
-					AbsPath().
-					Return(inputPath2),
-			)
-
-			outputPath1 := test.outputDir + "/test1" + test.outputExt
-			outputPath2 := test.outputDir + "/test2" + test.outputExt
-			gomock.InOrder(
-				mockImg.
-					EXPECT().
-					SaveAs(gomock.Eq(outputPath1)),
-				mockImg.
-					EXPECT().
-					SaveAs(gomock.Eq(outputPath2)),
-			)
+			allFilePathsMock := func(path string, ext string) ([]string, error) {
+				if path == inputAbsDir && ext == test.inputExt {
+					return []string{inputPath1, inputPath2}, nil
+				}
+				t.Errorf("AllFilePaths was not called correctly: %v %v", path, ext)
+				return nil, nil
+			}
 
-			mockImgFactory := mock_imgcnv.NewMockImageFileFactory(ctrl)
-			mockImgFactory.
-				EXPECT().
-				Create(gomock.Any()).
-				Return(mockImg, nil).
-				AnyTimes()
+			newImageFileMock := func(path string) (imgcnv.ImageFile, error) {
+				switch path {
+				case inputPath1:
+					return &ImageFileMock{
+						t:          t,
+						inputPath:  path,
+						outputPath: outputPath1,
+					}, nil
+				case inputPath2:
+					return &ImageFileMock{
+						t:          t,
+						inputPath:  path,
+						outputPath: outputPath2,
+					}, nil
+				}
+				return nil, nil
+			}
 
 			cli := &CLI{
-				dirPath:      mockDirPath,
-				imageFactory: mockImgFactory,
+				AllFilePaths: allFilePathsMock,
+				NewImageFIle: newImageFileMock,
 			}
 			cli.Execute(strings.Split(test.argString, " "))
 

kadai2/en-ken/go.mod

@@ -1,5 +1,3 @@
 module github.com/gopherdojo/dojo6/kadai2/en-ken
 
 go 1.12
-
-require github.com/golang/mock v1.3.1