simplify tests by removing redundant and using

Signed-off-by: Etai Lev Ran <[email protected]>

Author: elevran

pkg/epp/datalayer/datasource_test.go

@@ -25,8 +25,6 @@ import (
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
 )
 
-// --- Mocks ---
-
 type mockDataSource struct {
 	name string
 }

pkg/epp/datalayer/metrics_test.go

@@ -20,25 +20,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
 )
 
-func TestNewMetrics(t *testing.T) {
-	m := datalayer.NewMetrics()
-	assert.NotNil(t, m)
-	assert.NotNil(t, m.ActiveModels)
-	assert.NotNil(t, m.WaitingModels)
-
-	assert.Zero(t, m.MaxActiveModels)
-	assert.Zero(t, m.KVCacheUsagePercent)
-	assert.True(t, m.UpdateTime.IsZero())
-}
-
 func TestMetricsClone(t *testing.T) {
-	now := time.Now()
-
 	m := &datalayer.Metrics{
 		ActiveModels:            map[string]int{"modelA": 1},
 		WaitingModels:           map[string]int{"modelB": 2},
@@ -47,25 +35,19 @@ func TestMetricsClone(t *testing.T) {
 		WaitingQueueSize:        7,
 		KVCacheUsagePercent:     42.5,
 		KvCacheMaxTokenCapacity: 2048,
-		UpdateTime:              now,
+		UpdateTime:              time.Now(),
 	}
 
 	clone := m.Clone()
 
 	assert.NotNil(t, clone)
-	assert.Equal(t, m.ActiveModels, clone.ActiveModels)
-	assert.Equal(t, m.WaitingModels, clone.WaitingModels)
-	assert.Equal(t, m.MaxActiveModels, clone.MaxActiveModels)
-	assert.Equal(t, m.RunningQueueSize, clone.RunningQueueSize)
-	assert.Equal(t, m.WaitingQueueSize, clone.WaitingQueueSize)
-	assert.Equal(t, m.KVCacheUsagePercent, clone.KVCacheUsagePercent)
-	assert.Equal(t, m.KvCacheMaxTokenCapacity, clone.KvCacheMaxTokenCapacity)
-	assert.True(t, m.UpdateTime.Equal(clone.UpdateTime), "UpdateTime should be equal")
+	if diff := cmp.Diff(m, clone); diff != "" {
+		t.Errorf("Unexpected output (-want +got): %v", diff)
+	}
 
 	// ensure maps are cloned and not sharing pointers
 	clone.ActiveModels["modelA"] = 42
 	assert.Equal(t, 1, m.ActiveModels["modelA"], "mutating clone should not affect original")
-
 	clone.WaitingModels["modelB"] = 99
 	assert.Equal(t, 2, m.WaitingModels["modelB"], "mutating clone should not affect original")
 }

pkg/epp/datalayer/podinfo_test.go

@@ -61,7 +61,11 @@ func TestToPodInfo(t *testing.T) {
 }
 
 func TestPodInfoClone(t *testing.T) {
-	podinfo := datalayer.ToPodInfo(pod)
+	podinfo := &datalayer.PodInfo{
+		NamespacedName: types.NamespacedName{Name: name, Namespace: namespace},
+		Address:        podip,
+		Labels:         labels,
+	}
 
 	clone := podinfo.Clone()
 
@@ -80,16 +84,3 @@ func TestPodInfoString(t *testing.T) {
 	assert.Contains(t, s, namespace)
 	assert.Contains(t, s, podip)
 }
-
-func TestPodInfoInterfaceMethods(t *testing.T) {
-	nsn := types.NamespacedName{Name: name, Namespace: namespace}
-	info := &datalayer.PodInfo{
-		NamespacedName: nsn,
-		Address:        podip,
-	}
-
-	var addr datalayer.Addressable = info
-
-	assert.Equal(t, podip, addr.GetIPAddress())
-	assert.Equal(t, nsn, addr.GetNamespacedName())
-}