Address test failure

Author: Tim Middleton

coherence/named_cache_client.go

@@ -638,7 +638,7 @@ func getNamedCache[K comparable, V any](session *Session, name string, sOpts *Se
 		f(cacheOptions)
 	}
 
-	err := validateNearCacheOptions(cacheOptions.NearCacheOptions)
+	err := ensureNearCacheOptions(cacheOptions.NearCacheOptions)
 	if err != nil {
 		return nil, err
 	}
@@ -819,7 +819,7 @@ func convertNamedCacheClient[K comparable, V any](client *NamedCacheClient[K, V]
 	return client
 }
 
-func validateNearCacheOptions(options *NearCacheOptions) error {
+func ensureNearCacheOptions(options *NearCacheOptions) error {
 	if options == nil {
 		return nil
 	}
@@ -855,6 +855,11 @@ func validateNearCacheOptions(options *NearCacheOptions) error {
 		return ErrInvalidNearCacheWithNoTTL
 	}
 
+	// ensure the default prune factor is set if it is zero
+	if options.PruneFactor == 0 {
+		options.PruneFactor = defaultPruneFactor
+	}
+
 	return nil
 }
 

coherence/named_cache_client_test.go

@@ -52,18 +52,18 @@ func TestInvalidNearCacheOptions(t *testing.T) {
 		nearCacheOptions5 = NearCacheOptions{}
 	)
 
-	err := validateNearCacheOptions(&nearCacheOptions1)
+	err := ensureNearCacheOptions(&nearCacheOptions1)
 	g.Expect(err).To(gomega.Equal(ErrNegativeNearCacheOptions))
 
-	err = validateNearCacheOptions(&nearCacheOptions2)
+	err = ensureNearCacheOptions(&nearCacheOptions2)
 	g.Expect(err).To(gomega.Equal(ErrNegativeNearCacheOptions))
 
-	err = validateNearCacheOptions(&nearCacheOptions3)
+	err = ensureNearCacheOptions(&nearCacheOptions3)
 	g.Expect(err).To(gomega.Equal(ErrInvalidNearCacheWithNoTTL))
 
-	err = validateNearCacheOptions(&nearCacheOptions4)
+	err = ensureNearCacheOptions(&nearCacheOptions4)
 	g.Expect(err).To(gomega.Equal(ErrInvalidNearCacheWithTTL))
 
-	err = validateNearCacheOptions(&nearCacheOptions5)
+	err = ensureNearCacheOptions(&nearCacheOptions5)
 	g.Expect(err).To(gomega.Equal(ErrInvalidNearCache))
 }

coherence/named_map_client.go

@@ -902,7 +902,7 @@ func getNamedMap[K comparable, V any](session *Session, name string, sOpts *Sess
 		f(cacheOptions)
 	}
 
-	err := validateNearCacheOptions(cacheOptions.NearCacheOptions)
+	err := ensureNearCacheOptions(cacheOptions.NearCacheOptions)
 	if err != nil {
 		return nil, err
 	}

test/e2e/standalone/event_test.go

@@ -169,7 +169,7 @@ func TestEventDisconnectWithReadyTimeoutDelay(t *testing.T) {
 	fmt.Println("Issue stop of $GRPC:GrpcProxy")
 	_, err := utils.IssuePostRequest("http://127.0.0.1:30000/management/coherence/cluster/services/$GRPC:GrpcProxy/members/1/stop")
 	if err != nil {
-		t.Error("Unable to issue post request to stop gRPC proxy")
+		t.Error("Unable to issue post request to stop gRPC proxy", err)
 	}
 
 	utils.Sleep(5)

test/e2e/standalone/near_cache_test.go

@@ -57,8 +57,8 @@ func TestNearCacheOperationsAgainstMapAndCache(t *testing.T) {
 		{"RunTestNearCacheGetAllNamedCache2", GetNearCacheNamedCache[int, utils.Person](g, session, "near-cache-get-all-cache2", coherence.WithNearCache(&nearCacheOptions120Seconds)), RunTestNearCacheGetAll2},
 		{"RunTestNearCacheWithHighUnitsNamedMap", GetNearCacheNamedMap[int, utils.Person](g, session, "near-cache-high-units-map", coherence.WithNearCache(&nearCacheOptionsHighUnits1)), RunTestNearCacheWithHighUnits},
 		{"RunTestNearCacheWithHighUnitsNamedCache", GetNearCacheNamedCache[int, utils.Person](g, session, "near-cache-high-units-cache", coherence.WithNearCache(&nearCacheOptionsHighUnits1)), RunTestNearCacheWithHighUnits},
-		{"RunTestNearCacheWithHighUnitsNamedMapPruneFactor", GetNearCacheNamedMap[int, utils.Person](g, session, "near-cache-high-units-map", coherence.WithNearCache(&nearCacheOptionsHighUnits3)), RunTestNearCacheWithHighUnits},
-		{"RunTestNearCacheWithHighUnitsNamedCachePruneFactor", GetNearCacheNamedCache[int, utils.Person](g, session, "near-cache-high-units-cache", coherence.WithNearCache(&nearCacheOptionsHighUnits3)), RunTestNearCacheWithHighUnits},
+		{"RunTestNearCacheWithHighUnitsNamedMapPruneFactor", GetNearCacheNamedMap[int, utils.Person](g, session, "near-cache-high-units-prune-map", coherence.WithNearCache(&nearCacheOptionsHighUnits3)), RunTestNearCacheWithHighUnits},
+		{"RunTestNearCacheWithHighUnitsNamedCachePruneFactor", GetNearCacheNamedCache[int, utils.Person](g, session, "near-cache-high-units-prune-cache", coherence.WithNearCache(&nearCacheOptionsHighUnits3)), RunTestNearCacheWithHighUnits},
 		{"RunTestNearCacheWithHighUnitsMemoryNamedMap", GetNearCacheNamedMap[int, utils.Person](g, session, "near-cache-high-units-mem-map", coherence.WithNearCache(&nearCacheOptionsHighUnits2)), RunTestNearCacheWithHighUnitsMemory},
 		{"RunTestNearCacheWithHighUnitsMemoryNamedCache", GetNearCacheNamedCache[int, utils.Person](g, session, "near-cache-high-units-mem-cache", coherence.WithNearCache(&nearCacheOptionsHighUnits2)), RunTestNearCacheWithHighUnitsMemory},
 		{"RunTestNearCacheWithHighUnitsAccessNamedMap", GetNearCacheNamedMap[int, utils.Person](g, session, "near-cache-high-units-access-mem-map", coherence.WithNearCache(&nearCacheOptionsHighUnits1)), RunTestNearCacheWithHighUnitsAccess},