Add test for new Evict method

Author: cschleiden

internal/workflow/cache/cache.go

@@ -11,12 +11,12 @@ import (
 	"github.com/jellydator/ttlcache/v3"
 )
 
-type LruCache struct {
+type lruCache struct {
 	mc metrics.Client
 	c  *ttlcache.Cache[string, workflow.WorkflowExecutor]
 }
 
-func NewWorkflowExecutorLRUCache(mc metrics.Client, size int, expiration time.Duration) workflow.ExecutorCache {
+func NewWorkflowExecutorLRUCache(mc metrics.Client, size int, expiration time.Duration) *lruCache {
 	c := ttlcache.New(
 		ttlcache.WithCapacity[string, workflow.WorkflowExecutor](uint64(size)),
 		ttlcache.WithTTL[string, workflow.WorkflowExecutor](expiration),
@@ -37,13 +37,13 @@ func NewWorkflowExecutorLRUCache(mc metrics.Client, size int, expiration time.Du
 		mc.Counter(metrickeys.WorkflowInstanceCacheEviction, metrics.Tags{metrickeys.EvictionReason: reason}, 1)
 	})
 
-	return &LruCache{
+	return &lruCache{
 		mc: mc,
 		c:  c,
 	}
 }
 
-func (lc *LruCache) Get(ctx context.Context, instance *core.WorkflowInstance) (workflow.WorkflowExecutor, bool, error) {
+func (lc *lruCache) Get(ctx context.Context, instance *core.WorkflowInstance) (workflow.WorkflowExecutor, bool, error) {
 	e := lc.c.Get(getKey(instance))
 	if e != nil {
 		return e.Value(), true, nil
@@ -52,23 +52,23 @@ func (lc *LruCache) Get(ctx context.Context, instance *core.WorkflowInstance) (w
 	return nil, false, nil
 }
 
-func (lc *LruCache) Store(ctx context.Context, instance *core.WorkflowInstance, executor workflow.WorkflowExecutor) error {
+func (lc *lruCache) Store(ctx context.Context, instance *core.WorkflowInstance, executor workflow.WorkflowExecutor) error {
 	lc.c.Set(getKey(instance), executor, ttlcache.DefaultTTL)
 
 	lc.mc.Gauge(metrickeys.WorkflowInstanceCacheSize, metrics.Tags{}, int64(lc.c.Len()))
 
 	return nil
 }
 
-func (lc *LruCache) Evict(ctx context.Context, instance *core.WorkflowInstance) error {
+func (lc *lruCache) Evict(ctx context.Context, instance *core.WorkflowInstance) error {
 	lc.c.Delete(getKey(instance))
 
 	lc.mc.Gauge(metrickeys.WorkflowInstanceCacheSize, metrics.Tags{}, int64(lc.c.Len()))
 
 	return nil
 }
 
-func (lc *LruCache) StartEviction(ctx context.Context) {
+func (lc *lruCache) StartEviction(ctx context.Context) {
 	go lc.c.Start()
 
 	<-ctx.Done()

internal/workflow/cache/cache_test.go

@@ -57,7 +57,7 @@ func Test_Cache_StoreAndGet(t *testing.T) {
 	require.False(t, ok)
 }
 
-func Test_Cache_Evict(t *testing.T) {
+func Test_Cache_AutoEviction(t *testing.T) {
 	c := NewWorkflowExecutorLRUCache(
 		metrics.NewNoopMetricsClient(),
 		128,
@@ -87,6 +87,37 @@ func Test_Cache_Evict(t *testing.T) {
 	require.Nil(t, e2)
 }
 
+func Test_Cache_Evict(t *testing.T) {
+	c := NewWorkflowExecutorLRUCache(
+		metrics.NewNoopMetricsClient(),
+		128,
+		1, // Should evict immediately
+	)
+
+	i := core.NewWorkflowInstance("instanceID", "executionID")
+	r := wf.NewRegistry()
+	r.RegisterWorkflow(workflowWithActivity)
+	e, err := wf.NewExecutor(
+		slog.Default(), trace.NewNoopTracerProvider().Tracer(backend.TracerName), r,
+		converter.DefaultConverter, []workflow.ContextPropagator{}, &testHistoryProvider{}, i,
+		&metadata.WorkflowMetadata{}, clock.New(),
+	)
+	require.NoError(t, err)
+
+	err = c.Store(context.Background(), i, e)
+	require.NoError(t, err)
+
+	require.Equal(t, 1, c.c.Len())
+
+	require.NoError(t, c.Evict(context.Background(), i))
+	require.Equal(t, 0, c.c.Len())
+
+	e2, ok, err := c.Get(context.Background(), i)
+	require.NoError(t, err)
+	require.False(t, ok)
+	require.Nil(t, e2)
+}
+
 func workflowWithActivity(ctx workflow.Context) (int, error) {
 	r, err := workflow.ExecuteActivity[int](ctx, workflow.ActivityOptions{
 		RetryOptions: workflow.RetryOptions{