refactor: moved the GC stuff around and corrected all tests

vfs/disk/disk_test.go

@@ -2,6 +2,7 @@
 package disk
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -10,65 +11,85 @@ import (
 	"testing"
 )
 
-func TestAllDisk(t *testing.T) {
-	t.Parallel()
-
+func TestCreateAndOpen(t *testing.T) {
 	m := NewSkipInit(t.TempDir(), 1024)
-	w, err := m.Create("key", 5)
+	key := "key"
+	value := []byte("value")
+
+	w, err := m.Create(key, int64(len(value)))
 	if err != nil {
-		t.Errorf("Create failed: %v", err)
+		t.Fatalf("Create failed: %v", err)
 	}
-	w.Write([]byte("value"))
+	w.Write(value)
 	w.Close()
 
-	w, err = m.Create("key", 6)
+	rc, err := m.Open(key)
 	if err != nil {
-		t.Errorf("Create failed: %v", err)
+		t.Fatalf("Open failed: %v", err)
 	}
-	w.Write([]byte("value1"))
-	w.Close()
-
-	rc, err := m.Open("key")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ := io.ReadAll(rc)
+	got, _ := io.ReadAll(rc)
 	rc.Close()
-	if string(d) != "value1" {
-		t.Errorf("Get failed: got %s, want %s", d, "value1")
-	}
 
-	if err := m.Delete("key"); err != nil {
-		t.Errorf("Delete failed: %v", err)
-	}
-
-	if _, err := m.Open("key"); err == nil {
-		t.Errorf("Open failed: got nil, want %v", vfserror.ErrNotFound)
-	}
-
-	if err := m.Delete("key"); err == nil {
-		t.Errorf("Delete failed: got nil, want %v", vfserror.ErrNotFound)
-	}
-
-	if _, err := m.Stat("key"); err == nil {
-		t.Errorf("Stat failed: got nil, want %v", vfserror.ErrNotFound)
-	}
-
-	w, err = m.Create("key", 5)
-	if err != nil {
-		t.Errorf("Create failed: %v", err)
-	}
-	w.Write([]byte("value"))
-	w.Close()
-
-	if _, err := m.Stat("key"); err != nil {
-		t.Errorf("Stat failed: %v", err)
+	if string(got) != string(value) {
+		t.Fatalf("expected %s, got %s", value, got)
 	}
 }
 
-func TestLimited(t *testing.T) {
-	t.Parallel()
+func TestOverwrite(t *testing.T) {
+	m := NewSkipInit(t.TempDir(), 1024)
+	key := "key"
+	value1 := []byte("value1")
+	value2 := []byte("value2")
 
+	w, err := m.Create(key, int64(len(value1)))
+	if err != nil {
+		t.Fatalf("Create failed: %v", err)
+	}
+	w.Write(value1)
+	w.Close()
+
+	w, err = m.Create(key, int64(len(value2)))
+	if err != nil {
+		t.Fatalf("Create failed: %v", err)
+	}
+	w.Write(value2)
+	w.Close()
+
+	rc, err := m.Open(key)
+	if err != nil {
+		t.Fatalf("Open failed: %v", err)
+	}
+	got, _ := io.ReadAll(rc)
+	rc.Close()
+
+	if string(got) != string(value2) {
+		t.Fatalf("expected %s, got %s", value2, got)
+	}
+}
+
+func TestDelete(t *testing.T) {
+	m := NewSkipInit(t.TempDir(), 1024)
+	key := "key"
+	value := []byte("value")
+
+	w, err := m.Create(key, int64(len(value)))
+	if err != nil {
+		t.Fatalf("Create failed: %v", err)
+	}
+	w.Write(value)
+	w.Close()
+
+	if err := m.Delete(key); err != nil {
+		t.Fatalf("Delete failed: %v", err)
+	}
+
+	_, err = m.Open(key)
+	if !errors.Is(err, vfserror.ErrNotFound) {
+		t.Fatalf("expected %v, got %v", vfserror.ErrNotFound, err)
+	}
+}
+
+func TestCapacityLimit(t *testing.T) {
 	m := NewSkipInit(t.TempDir(), 10)
 	for i := 0; i < 11; i++ {
 		w, err := m.Create(fmt.Sprintf("key%d", i), 1)
@@ -84,15 +105,11 @@ func TestLimited(t *testing.T) {
 	}
 }
 
-func TestInit(t *testing.T) {
-	t.Parallel()
-
+func TestInitExistingFiles(t *testing.T) {
 	td := t.TempDir()
 
 	path := filepath.Join(td, "test", "key")
-
 	os.MkdirAll(filepath.Dir(path), 0755)
-
 	os.WriteFile(path, []byte("value"), 0644)
 
 	m := New(td, 10)
@@ -100,8 +117,13 @@ func TestInit(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Open failed: %v", err)
 	}
+	got, _ := io.ReadAll(rc)
 	rc.Close()
 
+	if string(got) != "value" {
+		t.Errorf("expected value, got %s", got)
+	}
+
 	s, err := m.Stat("test/key")
 	if err != nil {
 		t.Fatalf("Stat failed: %v", err)
@@ -114,16 +136,13 @@ func TestInit(t *testing.T) {
 	}
 }
 
-func TestDiskSizeDiscrepancy(t *testing.T) {
-	t.Parallel()
+func TestSizeConsistency(t *testing.T) {
 	td := t.TempDir()
-
-	assumedSize := int64(6 + 5 + 6) // 6 + 5 + 6 bytes for key, key1, key2
 	os.WriteFile(filepath.Join(td, "key2"), []byte("value2"), 0644)
 
 	m := New(td, 1024)
 	if m.Size() != 6 {
-		t.Errorf("Size failed: got %d, want %d", m.Size(), 6)
+		t.Errorf("Size failed: got %d, want 6", m.Size())
 	}
 
 	w, err := m.Create("key", 5)
@@ -140,6 +159,7 @@ func TestDiskSizeDiscrepancy(t *testing.T) {
 	w.Write([]byte("value1"))
 	w.Close()
 
+	assumedSize := int64(6 + 5 + 6)
 	if assumedSize != m.Size() {
 		t.Errorf("Size failed: got %d, want %d", m.Size(), assumedSize)
 	}
@@ -151,45 +171,10 @@ func TestDiskSizeDiscrepancy(t *testing.T) {
 	d, _ := io.ReadAll(rc)
 	rc.Close()
 	if string(d) != "value" {
-		t.Errorf("Get failed: got %s, want %s", d, "value")
-	}
-
-	rc, err = m.Open("key1")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ = io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value1" {
-		t.Errorf("Get failed: got %s, want %s", d, "value1")
+		t.Errorf("Get failed: got %s, want value", d)
 	}
 
 	m = New(td, 1024)
-
-	if assumedSize != m.Size() {
-		t.Errorf("Size failed: got %d, want %d", m.Size(), assumedSize)
-	}
-
-	rc, err = m.Open("key")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ = io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value" {
-		t.Errorf("Get failed: got %s, want %s", d, "value")
-	}
-
-	rc, err = m.Open("key1")
-	if err != nil {
-		t.Errorf("Open failed: %v", err)
-	}
-	d, _ = io.ReadAll(rc)
-	rc.Close()
-	if string(d) != "value1" {
-		t.Errorf("Get failed: got %s, want %s", d, "value1")
-	}
-
 	if assumedSize != m.Size() {
 		t.Errorf("Size failed: got %d, want %d", m.Size(), assumedSize)
 	}