Increasing coverage for lock and analyzer

Author: tro3

.gitignore

@@ -5,3 +5,5 @@
 /dep
 /testdep
 /dep.exe
+debug
+debug.*

analyzer.go

@@ -37,7 +37,7 @@ func (a analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
 	return m, nil, nil
 }
 
-func (a analyzer) Info() (name string, version *semver.Version) {
+func (a analyzer) Info() (string, *semver.Version) {
 	v, _ := semver.NewVersion("v0.0.1")
 	return "dep", v
 }

analyzer_test.go

@@ -10,9 +10,36 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/Masterminds/semver"
 	"github.com/golang/dep/test"
 )
 
+func TestAnalyzerInfo(t *testing.T) {
+	a := analyzer{}
+	n, v := a.Info()
+	if n != "dep" {
+		t.Errorf("analyzer.Info() returned an incorrect name: '%s' (expected 'dep')", n)
+	}
+	expV, err := semver.NewVersion("v0.0.1")
+	if err != nil {
+		t.Fatal(err)
+	} else if v != expV {
+		t.Fatalf("analyzer.Info() returned an incorrect version: %v (expected %v)", v, expV)
+	}
+}
+
+func TestAnalyzerErrors(t *testing.T) {
+	h := test.NewHelper(t)
+	defer h.Cleanup()
+	h.TempDir("dep")
+
+	a := analyzer{}
+	_, _, err := a.DeriveManifestAndLock(h.Path("dep"), "my/fake/project")
+	if err == nil {
+		t.Fatal("analyzer.DeriveManifestAndLock with manifest not present should have produced an error")
+	}
+}
+
 func TestDeriveManifestAndLock(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()

lock.go

@@ -64,7 +64,7 @@ func readLock(r io.Reader) (*Lock, error) {
 		} else if ld.Branch != "" {
 			v = gps.NewBranch(ld.Branch).Is(r)
 		} else if r == "" {
-			return nil, fmt.Errorf("lock file has entry for %s, but specifies no version", ld.Name)
+			return nil, fmt.Errorf("lock file has entry for %s, but specifies no branch or version", ld.Name)
 		}
 
 		id := gps.ProjectIdentifier{

lock_test.go

@@ -18,14 +18,7 @@ func TestReadLock(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()
 
-	_, err := readLock(h.GetTestFile("lock/error.json"))
-	if err == nil {
-		t.Error("Reading lock with invalid props should have caused error, but did not")
-	} else if !strings.Contains(err.Error(), "both a branch") {
-		t.Errorf("Unexpected error %q; expected multiple version error", err)
-	}
-
-	golden := "lock/golden.json"
+	golden := "lock/golden0.json"
 	l, err := readLock(h.GetTestFile(golden))
 	if err != nil {
 		t.Fatalf("Should have read Lock correctly, but got err %q", err)
@@ -45,15 +38,36 @@ func TestReadLock(t *testing.T) {
 
 	if !reflect.DeepEqual(l, l2) {
 		t.Error("Valid lock did not parse as expected")
+	}
+
+	golden = "lock/golden1.json"
+	l, err = readLock(h.GetTestFile(golden))
+	if err != nil {
+		t.Fatalf("Should have read Lock correctly, but got err %q", err)
+	}
+
+	b, _ = hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
+	l2 = &Lock{
+		Memo: b,
+		P: []gps.LockedProject{
+			gps.NewLockedProject(
+				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")},
+				gps.NewVersion("0.12.2").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
+				[]string{"."},
+			),
+		},
+	}
 
+	if !reflect.DeepEqual(l, l2) {
+		t.Error("Valid lock did not parse as expected")
 	}
 }
 
 func TestWriteLock(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()
 
-	golden := "lock/golden.json"
+	golden := "lock/golden0.json"
 	lg := h.GetTestFileString(golden)
 	memo, _ := hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
 	l := &Lock{
@@ -81,4 +95,79 @@ func TestWriteLock(t *testing.T) {
 			t.Errorf("Valid lock did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", lg, string(b))
 		}
 	}
+
+	golden = "lock/golden1.json"
+	lg = h.GetTestFileString(golden)
+	memo, _ = hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
+	l = &Lock{
+		Memo: memo,
+		P: []gps.LockedProject{
+			gps.NewLockedProject(
+				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/sdboyer/gps")},
+				gps.NewVersion("0.12.2").Is(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
+				[]string{"."},
+			),
+		},
+	}
+
+	b, err = l.MarshalJSON()
+	if err != nil {
+		t.Fatalf("Error while marshaling valid lock to JSON: %q", err)
+	}
+
+	if string(b) != lg {
+		if *test.UpdateGolden {
+			if err = h.WriteTestFile(golden, string(b)); err != nil {
+				t.Fatal(err)
+			}
+		} else {
+			t.Errorf("Valid lock did not marshal to JSON as expected:\n\t(GOT): %s\n\t(WNT): %s", lg, string(b))
+		}
+	}
+}
+
+func TestReadLockErrors(t *testing.T) {
+	h := test.NewHelper(t)
+	defer h.Cleanup()
+	var err error
+
+	tests := []struct {
+		name string
+		file string
+	}{
+		{"specified both", "lock/error0.json"},
+		{"invalid hash", "lock/error1.json"},
+		{"no branch or version", "lock/error2.json"},
+	}
+
+	for _, tst := range tests {
+		_, err = readLock(h.GetTestFile(tst.file))
+		if err == nil {
+			t.Errorf("Reading lock with %s should have caused error, but did not", tst.name)
+		} else if !strings.Contains(err.Error(), tst.name) {
+			t.Errorf("Unexpected error %q; expected %s error", err, tst.name)
+		}
+	}
+
+	// _, err = readLock(h.GetTestFile("lock/error0.json"))
+	// if err == nil {
+	// 	t.Error("Reading lock with invalid props should have caused error, but did not")
+	// } else if !strings.Contains(err.Error(), "both a branch") {
+	// 	t.Errorf("Unexpected error %q; expected multiple version error", err)
+	// }
+	//
+	// _, err = readLock(h.GetTestFile("lock/error1.json"))
+	// if err == nil {
+	// 	t.Error("Reading lock with invalid hash should have caused error, but did not")
+	// } else if !strings.Contains(err.Error(), "invalid hash") {
+	// 	t.Errorf("Unexpected error %q; expected invalid hash error", err)
+	// }
+	//
+	// _, err = readLock(h.GetTestFile("lock/error2.json"))
+	// if err == nil {
+	// 	t.Error("Reading lock with invalid props should have caused error, but did not")
+	// } else if !strings.Contains(err.Error(), "no version") {
+	// 	t.Errorf("Unexpected error %q; expected no version error", err)
+	// }
+
 }

testdata/lock/error.json renamed to testdata/lock/error0.json

@@ -0,0 +1,13 @@
+{
+    "memo": "000aaa2a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/gps",
+            "branch": "master",
+            "revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}

testdata/lock/error1.json

@@ -0,0 +1,11 @@
+{
+    "memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/gps",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}

testdata/lock/error2.json

@@ -0,0 +1,13 @@
+{
+    "memo": "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e",
+    "projects": [
+        {
+            "name": "github.com/sdboyer/gps",
+            "version": "0.12.2",
+            "revision": "d05d5aca9f895d19e9265839bffeadd74a2d2ecb",
+            "packages": [
+                "."
+            ]
+        }
+    ]
+}