SearcherとConverterとFacadeをリファクタリングしてfacadeの振る舞いテストができるように実装

Author: kaznishi

kadai2/kadai2-2/imageConvert.go

@@ -30,6 +30,8 @@ func main() {
 		return
 	}
 
-	var icFacade imageconverter.Facade
+	var searcher imageconverter.Searcher
+	var converter imageconverter.Converter
+	icFacade := imageconverter.Facade{Searcher: searcher, Converter: converter}
 	icFacade.Run(targetPath, inputFormat, outputFormat)
 }

kadai2/kadai2-2/imageconverter/converter.go

@@ -9,6 +9,10 @@ import (
 	"regexp"
 )
 
+type ConverterInterface interface {
+	Run(f FileInfo, in, out Format)
+}
+
 // Converter 画像ファイル変換器
 type Converter struct{}
 

kadai2/kadai2-2/imageconverter/facade.go

@@ -1,16 +1,15 @@
 package imageconverter
 
 // Facade mainからの命令窓口
-type Facade struct{}
+type Facade struct {
+	Searcher  SearcherInterface
+	Converter ConverterInterface
+}
 
 // Run Searcherを使ってファイル群を走査、Converterを使ってファイル群を変換処理にかける
-func (Facade) Run(targetPath FilePath, in, out Format) {
-
-	var searcher Searcher
-	var converter Converter
-
-	fileInfoList := searcher.Run(FileInfo{Path: targetPath})
+func (f *Facade) Run(targetPath FilePath, in, out Format) {
+	fileInfoList := f.Searcher.Run(FileInfo{Path: targetPath})
 	for _, fileInfo := range fileInfoList {
-		converter.Run(fileInfo, in, out)
+		f.Converter.Run(fileInfo, in, out)
 	}
 }

kadai2/kadai2-2/imageconverter/facade_test.go

@@ -0,0 +1,51 @@
+package imageconverter_test
+
+import (
+	"testing"
+
+	"github.com/gopherdojo/dojo2/kadai2/kadai2-2/imageconverter"
+)
+
+var (
+	calledCountSearcherRun  int
+	calledCountConverterRun int
+)
+
+type SearcherMock struct{}
+
+func (SearcherMock) Run(target imageconverter.FileInfo) []imageconverter.FileInfo {
+	calledCountSearcherRun += 1
+	fis := []imageconverter.FileInfo{
+		imageconverter.FileInfo{Path: imageconverter.FilePath("../sample_dir1/Octocat.jpeg")},
+		imageconverter.FileInfo{Path: imageconverter.FilePath("../sample_dir1/dummy_fuga.md")},
+		imageconverter.FileInfo{Path: imageconverter.FilePath("../sample_dir1/dummy_hoge.txt")},
+	}
+	return fis
+}
+
+type ConverterMock struct{}
+
+func (ConverterMock) Run(f imageconverter.FileInfo, in, out imageconverter.Format) {
+	calledCountConverterRun += 1
+	return
+}
+
+func TestFacade_Run(t *testing.T) {
+	var searcher SearcherMock
+	var converter ConverterMock
+
+	targetPath := imageconverter.FilePath("../sample_dir1")
+	inputFormat := imageconverter.Format("jpg")
+	outputFormat := imageconverter.Format("png")
+
+	facade := imageconverter.Facade{Searcher: searcher, Converter: converter}
+	facade.Run(targetPath, inputFormat, outputFormat)
+
+	if calledCountSearcherRun != 1 {
+		t.Errorf("Facade Run called count is wrong.")
+	}
+	if calledCountConverterRun != 3 {
+		t.Errorf("Facade Run called count is wrong.")
+	}
+
+}

kadai2/kadai2-2/imageconverter/searcher.go

@@ -6,6 +6,10 @@ import (
 	"path/filepath"
 )
 
+type SearcherInterface interface {
+	Run(target FileInfo) []FileInfo
+}
+
 // Searcher 対象ディレクトリファイルの検索器
 type Searcher struct{}