chore: fix test coverage

garethgeorge · Nov 16, 2023 · 4c95908 · 4c95908
1 parent a333001
commit 4c95908
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 8 deletions.
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -35,22 +35,22 @@ func TestConfig(t *testing.T) {
 		{
 			name: "default config",
 			config: NewDefaultConfig(),
-			store:  &CachingValidatingStore{ConfigStore: &YamlFileStore{Path: dir + "/default-config.yaml"}},
+			store:  &CachingValidatingStore{ConfigStore: &JsonFileStore{Path: dir + "/default-config.json"}},
 		},
 		{
 			name: "simple valid config",
 			config: &v1.Config{
 				Repos: []*v1.Repo{testRepo},
 				Plans: []*v1.Plan{testPlan},
 			},
-			store: &CachingValidatingStore{ConfigStore: &YamlFileStore{Path: dir + "/valid-config.yaml"}},
+			store: &CachingValidatingStore{ConfigStore: &JsonFileStore{Path: dir + "/valid-config.json"}},
 		},
 		{
 			name: "plan references non-existent repo",
 			config: &v1.Config{
 				Plans: []*v1.Plan{testPlan},
 			},
-			store:  &CachingValidatingStore{ConfigStore: &YamlFileStore{Path: dir + "/invalid-config.yaml"}},
+			store:  &CachingValidatingStore{ConfigStore: &JsonFileStore{Path: dir + "/invalid-config.json"}},
 			wantErr: true,
 			wantErrContains: "repo \"test-repo\" not found",
 		},
@@ -62,7 +62,7 @@ func TestConfig(t *testing.T) {
 					testRepo,
 				},
 			},
-			store:  &CachingValidatingStore{ConfigStore: &YamlFileStore{Path: dir + "/invalid-config2.yaml"}},
+			store:  &CachingValidatingStore{ConfigStore: &JsonFileStore{Path: dir + "/invalid-config2.json"}},
 			wantErr: true,
 			wantErrContains: "repo test-repo: duplicate id",
 		},
@@ -81,7 +81,7 @@ func TestConfig(t *testing.T) {
 					},
 				},
 			},
-			store:  &CachingValidatingStore{ConfigStore: &YamlFileStore{Path: dir + "/invalid-config3.yaml"}},
+			store:  &CachingValidatingStore{ConfigStore: &JsonFileStore{Path: dir + "/invalid-config3.json"}},
 			wantErr: true,
 			wantErrContains: "invalid cron \"bad cron\"",
 		},

diff --git a/internal/database/oplog/oplog_test.go b/internal/database/oplog/oplog_test.go
@@ -32,16 +32,50 @@ func TestAddOperation(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name: "basic operation",
+			name: "no operation",
 			op: &v1.Operation{
 				Id: 0,
 			},
+			wantErr: true,
+		},
+		{
+			name: "basic backup operation",
+			op: &v1.Operation{
+				Id: 0,
+				Op: &v1.Operation_OperationBackup{},
+			},
+			wantErr: false,
+		},
+		{
+			name: "basic snapshot operation",
+			op: &v1.Operation{
+				Id: 0,
+				Op: &v1.Operation_OperationIndexSnapshot{
+					OperationIndexSnapshot: &v1.OperationIndexSnapshot{
+						Snapshot: &v1.ResticSnapshot{
+							Id: "test",
+						},
+					},
+				},
+			},
 			wantErr: false,
 		},
+		{
+			name: "basic snapshot operation with no snapshot",
+			op: &v1.Operation{
+				Id: 0,
+				Op: &v1.Operation_OperationIndexSnapshot{
+					OperationIndexSnapshot: &v1.OperationIndexSnapshot{
+					},
+				},
+			},
+			wantErr: true,
+		},
 		{
 			name: "operation with ID",
 			op: &v1.Operation{
 				Id: 1,
+				Op: &v1.Operation_OperationBackup{},
 			},
 			wantErr: true,
 		},
@@ -50,13 +84,15 @@ func TestAddOperation(t *testing.T) {
 			op: &v1.Operation{
 				Id: 0,
 				RepoId: "testrepo",
+				Op: &v1.Operation_OperationBackup{},
 			},
 		},
 		{
 			name: "operation with plan",
 			op: &v1.Operation{
 				Id: 0,
 				PlanId: "testplan",
+				Op: &v1.Operation_OperationBackup{},
 			},
 		},
 	}
@@ -88,16 +124,19 @@ func TestListOperation(t *testing.T) {
 			PlanId: "plan1",
 			RepoId: "repo1",
 			DisplayMessage: "op1",
+			Op: &v1.Operation_OperationBackup{},
 		},
 		{
 			PlanId: "plan1",
 			RepoId: "repo2",
 			DisplayMessage: "op2",
+			Op: &v1.Operation_OperationBackup{},
 		},
 		{
 			PlanId: "plan2",
 			RepoId: "repo2",
 			DisplayMessage: "op3",
+			Op: &v1.Operation_OperationBackup{},
 		},
 	}
 
@@ -175,6 +214,7 @@ func TestBigIO(t *testing.T) {
 		if err := log.Add(&v1.Operation{
 			PlanId: "plan1",
 			RepoId: "repo1",
+			Op: &v1.Operation_OperationBackup{},
 		}); err != nil {
 			t.Fatalf("error adding operation: %s", err)
 		}

diff --git a/internal/database/serializationutil/serializationutil.go b/internal/database/serializationutil/serializationutil.go
@@ -46,5 +46,8 @@ func BytesToKey(b []byte) []byte {
 }
 
 func NormalizeSnapshotId(id string) string {
+	if len(id) < 8 {
+		return id
+	}
 	return id[:8]
 }
diff --git a/internal/database/serializationutil/serializationutil_test.go b/internal/database/serializationutil/serializationutil_test.go
@@ -6,7 +6,7 @@ func TestItoa(t *testing.T) {
 	nums := []int64{0, 1, 2, 3, 4, 1 << 32, int64(1) << 62}
 	for _, num := range nums {
 		b := Itob(num)
-		if Btoi(b) != num {
+		if v, _ := Btoi(b); v != num {
 			t.Errorf("itob/btoi failed for %d", num)
 		}
 	}
@@ -16,7 +16,7 @@ func TestStob(t *testing.T) {
 	strs := []string{"", "a", "ab", "abc", "abcd", "abcde", "abcdef"}
 	for _, str := range strs {
 		b := Stob(str)
-		if val, _ := Btos(b); val != str {
+		if val, _, _ := Btos(b); val != str {
 			t.Errorf("stob/btos failed for %s", str)
 		}
 	}