some cleanup of things and moar unit tests...

Signed-off-by: ed kim <ekim8015@gmail.com>

Author: edify42

Makefile

@@ -1,4 +1,7 @@
-test:
+tester:
 	go test ./... -v
 test-coverage:
-	go test ./... -coverprofile cp.out
+	go test ./... -coverprofile cp.out
+
+test-nocache:
+	go test ./... -v -count=1

command/init.go

@@ -76,8 +76,6 @@ func (c *Config) RunInit() error {
 
 	}
 
-	// TODO: Early exit of RunInit if we find config in current working directory
-
 	// Check location supplied by init parameter first
 	if len(c.location) > 0 {
 		c.location = path.Clean(c.location)
@@ -116,7 +114,7 @@ func (c *Config) RunInit() error {
 	array, err := walker.Walker(&handler)
 
 	for _, fileObject := range array {
-		zap.S().Debugf("Something something %v", fileObject)
+		zap.S().Debugf("single record dump %v", fileObject)
 	}
 
 	return nil

filewalk/walker.go

@@ -31,6 +31,7 @@ func NewWalker(location string, exclude, include []string) *WalkerConfig {
 // FileObject might be something we use.
 type FileObject struct {
 	name    string
+	path    string
 	md5     string
 	sha1sum string
 	etag    string
@@ -48,22 +49,22 @@ func (w *WalkerConfig) Walker(fh Handler) (ReturnObject, error) {
 	var fileObject FileObject
 	helper := &godirwalk.Options{
 		Callback: func(osPathname string, de *godirwalk.Dirent) error {
-			zap.S().Debugf("lets try match %s %s\n", w.Exclude, osPathname)
 			if de.IsDir() {
 				return nil
 			}
-
+			zap.S().Debugf("lets try match %s %s", w.Include, osPathname)
 			matched := w.returnMatch(osPathname)
 			if matched {
-				zap.S().Debugf("matched: %s\n", osPathname)
+				zap.S().Debugf("matched: %s", osPathname)
 				file := fh.loadFile(osPathname)
 				sha1sum := fh.sha1sum(file)
 				zap.S().Debugf("sha1sum of the file is %s", sha1sum) // TODO: make the logging better
 				md5 := fh.md5(file)
 				zap.S().Debugf("md5sum of the file is %s", md5)
 				etag := fh.etag(file)
 				zap.S().Debugf("etag of the file is %s", etag)
-				fileObject.name = osPathname
+				fileObject.name = de.Name()
+				fileObject.path = osPathname // TODO: Clean this up?
 				fileObject.md5 = md5
 				fileObject.etag = etag
 				fileObject.sha1sum = sha1sum
@@ -78,7 +79,7 @@ func (w *WalkerConfig) Walker(fh Handler) (ReturnObject, error) {
 		Unsorted: true, // (optional) set true for faster yet non-deterministic enumeration (see godoc)
 	}
 	_ = godirwalk.Walk(w.Location, helper)
-	zap.S().Debugf("all the things: %v", buff)
+	zap.S().Debugf("all the files found are: %v", buff)
 	return returnObject, nil
 }
 

filewalk/walker_test.go

@@ -1,6 +1,10 @@
 package filewalk
 
 import (
+	"crypto/md5"
+	"crypto/sha1"
+	"fmt"
+	"reflect"
 	"testing"
 
 	"github.com/edify42/camera-backup/config"
@@ -90,3 +94,76 @@ func TestWalkerConfig_returnMatch(t *testing.T) {
 		})
 	}
 }
+
+// Mocked out interface functions.
+
+type testHandle struct{}
+
+func (h *testHandle) sha1sum(data []byte) string {
+	return fmt.Sprintf("%x", sha1.Sum(data))
+}
+
+func (h *testHandle) md5(data []byte) string {
+	return fmt.Sprintf("%x", md5.Sum(data))
+}
+
+func (h *testHandle) etag(data []byte) string {
+	return fmt.Sprintf("%x", md5.Sum(data))
+}
+
+func (h *testHandle) loadFile(path string) []byte {
+	return []byte(path)
+}
+
+func TestWalkerConfig_Walker(t *testing.T) {
+	type fields struct {
+		Location string
+		Exclude  []string
+		Include  []string
+	}
+	type args struct {
+		fh Handler
+	}
+
+	myHandle := &testHandle{}
+	var returnObject ReturnObject
+
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    ReturnObject
+		wantErr bool
+	}{
+		{
+			name: "First test case",
+			fields: fields{
+				Location: "here",
+				Exclude:  []string{""},
+				Include:  []string{""},
+			},
+			args: args{
+				fh: myHandle,
+			},
+			want:    returnObject,
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			w := &WalkerConfig{
+				Location: tt.fields.Location,
+				Exclude:  tt.fields.Exclude,
+				Include:  tt.fields.Include,
+			}
+			got, err := w.Walker(tt.args.fh)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("WalkerConfig.Walker() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("WalkerConfig.Walker() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

localstore/init.go

@@ -53,7 +53,7 @@ func InitDB(i Sqlstore) error {
 		return err
 	}
 
-	db, err := sql.Open("sqlite3", database)
+	db, err := sql.Open("sqlite3", database) // Might mock out this bit later into a separate function....Unsure why it works...
 	if err != nil {
 		zap.S().Errorf("Could not open the database %v", err)
 		return err

localstore/init_test.go

@@ -98,6 +98,7 @@ func TestInitDB(t *testing.T) {
 			args: args{
 				i: c,
 			},
+			wantErr: false,
 		},
 	}
 	for _, tt := range tests {