From 8cfb81cb138f34a42ea082ab49381047bfed5349 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Fri, 7 Mar 2025 09:59:14 -0500 Subject: [PATCH] Harden NamedCacheProxyProtocolIT (merge 14.1.2.0 -> ce/14.1.2.0 114830) [git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.2.0/": change = 114831] --- .../src/main/java/grpc/proxy/BaseGrpcIT.java | 15 ++ .../version_1/NamedCacheProxyProtocolIT.java | 178 +++++++++--------- 2 files changed, 104 insertions(+), 89 deletions(-) diff --git a/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/BaseGrpcIT.java b/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/BaseGrpcIT.java index 367a820fc9b09..6762875b5bb08 100644 --- a/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/BaseGrpcIT.java +++ b/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/BaseGrpcIT.java @@ -69,6 +69,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Stream; @@ -445,6 +446,18 @@ protected ConfigurableCacheFactory ensureCCF(String sScopeOrNull) return s_mapCCF.computeIfAbsent(sScope, BaseGrpcIT::createCCF); } + protected String ensureUniqueName() + { + return ensureScopeName(null); + } + + protected String ensureUniqueName(String sName) + { + return sName == null || sName.isBlank() + ? "test-" + s_id.incrementAndGet() + : sName + "-" + s_id.incrementAndGet(); + } + protected static ConfigurableCacheFactory createCCF(String sScope) { ClassLoader loader = Classes.getContextClassLoader(); @@ -554,6 +567,8 @@ protected MapEvent toSimpleEvent(MapEvent event) // ----- data members --------------------------------------------------- + protected static final AtomicLong s_id = new AtomicLong(0L); + protected static ConfigurableCacheFactory s_ccfDefault; protected final static Map s_mapCCF = new ConcurrentHashMap<>(); diff --git a/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/version_1/NamedCacheProxyProtocolIT.java b/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/version_1/NamedCacheProxyProtocolIT.java index a138bc68711d7..ba6b8cadae661 100644 --- a/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/version_1/NamedCacheProxyProtocolIT.java +++ b/prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/version_1/NamedCacheProxyProtocolIT.java @@ -138,7 +138,7 @@ public void shouldFailIfCacheNotEnsured(String ignored, Serializer serializer, S @MethodSource("serializers") public void shouldAddIndex(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "add-index-cache"; + String sCacheName = ensureUniqueName( "add-index-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); Map indexMap = removeIndexes(cache); @@ -170,7 +170,7 @@ public void shouldAddIndex(String ignored, Serializer serializer, String sScope) @MethodSource("serializers") public void shouldAddSortedIndex(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "add-index-cache"; + String sCacheName = ensureUniqueName( "add-index-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); Map indexMap = removeIndexes(cache); @@ -200,7 +200,7 @@ public void shouldAddSortedIndex(String ignored, Serializer serializer, String s @MethodSource("serializers") public void shouldAddSortedIndexWithComparator(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "add-index-cache"; + String sCacheName = ensureUniqueName("add-index-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); Map indexMap = removeIndexes(cache); @@ -237,7 +237,7 @@ public void shouldAddSortedIndexWithComparator(String ignored, Serializer serial public void shouldCallAggregateWithFilterExpectingSingleResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -283,7 +283,7 @@ public void shouldCallAggregateWithFilterMatchingNoEntriesExpectingSingleResult( String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -324,7 +324,7 @@ public void shouldCallAggregateWithFilterMatchingNoEntriesExpectingSingleResult( @MethodSource("serializers") public void shouldCallAggregateWithKeysExpectingSingleResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -373,7 +373,7 @@ public void shouldCallAggregateWithKeysExpectingSingleResult(String ignored, Ser public void shouldCallAggregateWithKeysMatchingNoEntriesExpectingSingleResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -422,7 +422,7 @@ public void shouldCallAggregateWithKeysMatchingNoEntriesExpectingSingleResult(St public void shouldCallAggregateWithNoKeysOrFilterExpectingSingleResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -460,7 +460,7 @@ public void shouldCallAggregateWithNoKeysOrFilterExpectingSingleResult(String ig @MethodSource("serializers") public void shouldCallAggregateWithFilterExpectingMapResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -503,7 +503,7 @@ public void shouldCallAggregateWithFilterExpectingMapResult(String ignored, Seri @MethodSource("serializers") public void shouldCallAggregateWithKeysExpectingMapResult(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -555,7 +555,7 @@ public void shouldCallAggregateWithKeysExpectingMapResult(String ignored, Serial @MethodSource("serializers") public void shouldClearEmptyCache(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -574,7 +574,7 @@ public void shouldClearEmptyCache(String ignored, Serializer serializer, String @MethodSource("serializers") public void shouldClearPopulatedCache(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 10); @@ -595,7 +595,7 @@ public void shouldClearPopulatedCache(String ignored, Serializer serializer, Str @MethodSource("serializers") public void shouldContainEntryWhenMappingPresent(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 3); @@ -623,7 +623,7 @@ public void shouldContainEntryWhenMappingPresent(String ignored, Serializer seri public void shouldNotContainEntryWhenMappingHasDifferentValue(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 3); @@ -650,7 +650,7 @@ public void shouldNotContainEntryWhenMappingHasDifferentValue(String ignored, Se @MethodSource("serializers") public void shouldNotContainEntryWhenMappingNotPresent(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 3); @@ -680,7 +680,7 @@ public void shouldNotContainEntryWhenMappingNotPresent(String ignored, Serialize public void shouldReturnTrueForContainsKeyWithExistingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -705,7 +705,7 @@ public void shouldReturnTrueForContainsKeyWithExistingMapping(String ignored, Se public void shouldReturnFalseForContainsKeyWithNonExistentMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -730,7 +730,7 @@ public void shouldReturnFalseForContainsKeyWithNonExistentMapping(String ignored @MethodSource("serializers") public void shouldContainValueWhenValuePresent(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 3); @@ -753,7 +753,7 @@ public void shouldContainValueWhenValuePresent(String ignored, Serializer serial @MethodSource("serializers") public void shouldContainValueWhenValuePresentMultipleTimes(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.put("key-1", "value-1"); cache.put("key-2", "value-2"); @@ -779,7 +779,7 @@ public void shouldContainValueWhenValuePresentMultipleTimes(String ignored, Seri @MethodSource("serializers") public void shouldNotContainValueWhenMappingNotPresent(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 3); @@ -804,7 +804,7 @@ public void shouldNotContainValueWhenMappingNotPresent(String ignored, Serialize @MethodSource("serializers") public void shouldDestroyCache(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); TestProxyResponseStreamObserver observer = new TestProxyResponseStreamObserver(); @@ -845,7 +845,7 @@ public void shouldDestroyCache(String ignored, Serializer serializer, String sSc @MethodSource("serializers") public void shouldCallEntrySetWithFilterWhenSomeEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -880,7 +880,7 @@ public void shouldCallEntrySetWithFilterWhenSomeEntriesMatch(String ignored, Ser @MethodSource("serializers") public void shouldCallEntrySetWithFilterWhenAllEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -915,7 +915,7 @@ public void shouldCallEntrySetWithFilterWhenAllEntriesMatch(String ignored, Seri @MethodSource("serializers") public void shouldCallEntrySetWithFilterWhenNoEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -952,7 +952,7 @@ public void shouldCallEntrySetWithFilterWhenNoEntriesMatch(String ignored, Seria public void shouldCallEntrySetWithFilterAndComparatorWhenSomeEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++) @@ -994,7 +994,7 @@ public void shouldCallEntrySetWithFilterAndComparatorWhenSomeEntriesMatch(String public void shouldCallEntrySetWithFilterAndComparatorWhenAllEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++) @@ -1036,7 +1036,7 @@ public void shouldCallEntrySetWithFilterAndComparatorWhenAllEntriesMatch(String public void shouldCallEntrySetWithFilterAndComparatorWhenNoEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++) @@ -1075,7 +1075,7 @@ public void shouldCallEntrySetWithFilterAndComparatorWhenNoEntriesMatch(String i @MethodSource("serializers") public void shouldReceiveTruncateEvent(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("foo", "bar"); @@ -1116,7 +1116,7 @@ public void shouldReceiveTruncateEvent(String ignored, Serializer serializer, St @MethodSource("serializers") public void shouldSubscribeToAllEvents(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listener = new CollectingMapListener<>(); MapEventFilter filter = new MapEventFilter<>(MapEventFilter.E_ALL, Filters.always()); NamedCache cache = ensureEmptyCache(sScope, sCacheName); @@ -1179,7 +1179,7 @@ public void shouldSubscribeToAllEvents(String ignored, Serializer serializer, St @MethodSource("serializers") public void shouldSubscribeToSingleEventForSingleKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listener = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1227,7 +1227,7 @@ public void shouldSubscribeToSingleEventForSingleKey(String ignored, Serializer @MethodSource("serializers") public void shouldSubscribeToAllEventsForSingleKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listener = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1286,7 +1286,7 @@ public void shouldSubscribeToAllEventsForSingleKey(String ignored, Serializer se @MethodSource("serializers") public void shouldAddPrimingListenerForNonExistentKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); String key = "key-2"; NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1329,7 +1329,7 @@ public void shouldAddPrimingListenerForNonExistentKey(String ignored, Serializer @MethodSource("serializers") public void shouldAddPrimingListenerForExistingKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); String key = "key-2"; NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1373,7 +1373,7 @@ public void shouldAddPrimingListenerForExistingKey(String ignored, Serializer se @MethodSource("serializers") public void shouldAddMapTrigger(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1422,7 +1422,7 @@ public void shouldAddMapTrigger(String ignored, Serializer serializer, String sS @MethodSource("serializers") public void shouldSubscribeToEventsForMultipleKeys(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listener = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1493,7 +1493,7 @@ public void shouldSubscribeToEventsForMultipleKeys(String ignored, Serializer se @MethodSource("serializers") public void shouldSubscribeToEventsForFilter(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listener = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1556,7 +1556,7 @@ public void shouldSubscribeToEventsForFilter(String ignored, Serializer serializ @MethodSource("serializers") public void shouldSubscribeToEventsForKeyAndFilter(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); String key = "key-2"; CollectingMapListener listenerOne = new CollectingMapListener<>(); CollectingMapListener listenerTwo = new CollectingMapListener<>(); @@ -1625,7 +1625,7 @@ public void shouldSubscribeToEventsForKeyAndFilter(String ignored, Serializer se @MethodSource("serializers") public void shouldSubscribeToEventsForMultipleFilters(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listenerOne = new CollectingMapListener<>(); CollectingMapListener listenerTwo = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); @@ -1698,7 +1698,7 @@ public void shouldSubscribeToEventsForMultipleFilters(String ignored, Serializer @MethodSource("serializers") public void shouldSubscribeToEventsForMultipleOverlappingFilters(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); CollectingMapListener listenerOne = new CollectingMapListener<>(); CollectingMapListener listenerTwo = new CollectingMapListener<>(); NamedCache cache = ensureEmptyCache(sScope, sCacheName); @@ -1764,7 +1764,7 @@ public void shouldSubscribeToEventsForMultipleOverlappingFilters(String ignored, @MethodSource("serializers") public void shouldAddPrimingListenerWithFilter(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-events-" + System.currentTimeMillis(); + String sCacheName = ensureUniqueName("test-events"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-4", "value-4"); @@ -1848,7 +1848,7 @@ public void shouldAddPrimingListenerWithFilter(String ignored, Serializer serial @MethodSource("serializers") public void shouldGetExistingKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1875,7 +1875,7 @@ public void shouldGetExistingKey(String ignored, Serializer serializer, String s @MethodSource("serializers") public void shouldGetExistingKeyMappedToNull(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", null); @@ -1901,7 +1901,7 @@ public void shouldGetExistingKeyMappedToNull(String ignored, Serializer serializ @MethodSource("serializers") public void shouldGetNonExistentKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -1928,7 +1928,7 @@ public void shouldGetNonExistentKey(String ignored, Serializer serializer, Strin @MethodSource("serializers") public void shouldGetAllForEmptyKeyCollection(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -1939,7 +1939,7 @@ public void shouldGetAllForEmptyKeyCollection(String ignored, Serializer seriali @MethodSource("serializers") public void shouldGetAllWhenNoKeysMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 4); @@ -1952,7 +1952,7 @@ public void shouldGetAllWhenNoKeysMatch(String ignored, Serializer serializer, S @MethodSource("serializers") public void shouldGetAllWhenAllKeysMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 4); @@ -1965,7 +1965,7 @@ public void shouldGetAllWhenAllKeysMatch(String ignored, Serializer serializer, @MethodSource("serializers") public void shouldGetAllWhenAllSomeKeysMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 4); @@ -2012,7 +2012,7 @@ void assertGetAll(NamedCache cache, Serializer serializer, Strin @MethodSource("serializers") public void shouldCallInvoke(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); String sKey = "bb"; Person person = new Person("bob", "builder", 25, "male"); @@ -2048,7 +2048,7 @@ public void shouldCallInvoke(String ignored, Serializer serializer, String sScop public void shouldCallInvokeWithMissingEntryProcessor(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); TestProxyResponseStreamObserver observer = new TestProxyResponseStreamObserver(); @@ -2071,7 +2071,7 @@ public void shouldCallInvokeWithMissingEntryProcessor(String ignored, Serializer @MethodSource("serializers") public void shouldCallInvokeAllWithFilter(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2114,7 +2114,7 @@ public void shouldCallInvokeAllWithFilter(String ignored, Serializer serializer, @MethodSource("serializers") public void shouldCallInvokeAllWithNoFilterOrKeys(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2154,7 +2154,7 @@ public void shouldCallInvokeAllWithNoFilterOrKeys(String ignored, Serializer ser @MethodSource("serializers") public void shouldCallInvokeAllWithKeys(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2198,7 +2198,7 @@ public void shouldCallInvokeAllWithKeys(String ignored, Serializer serializer, S @MethodSource("serializers") public void shouldCallInvokeAllWithMissingProcessor(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); TestProxyResponseStreamObserver observer = new TestProxyResponseStreamObserver(); StreamObserver channel = openChannel(observer); @@ -2222,7 +2222,7 @@ public void shouldCallInvokeAllWithMissingProcessor(String ignored, Serializer s @MethodSource("serializers") public void shouldBeEmpty(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2241,7 +2241,7 @@ public void shouldBeEmpty(String ignored, Serializer serializer, String sScope) @MethodSource("serializers") public void shouldNotBeEmpty(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 10); @@ -2262,7 +2262,7 @@ public void shouldNotBeEmpty(String ignored, Serializer serializer, String sScop @MethodSource("serializers") public void shouldCallKeySetWithFilterWhenSomeEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2300,7 +2300,7 @@ public void shouldCallKeySetWithFilterWhenSomeEntriesMatch(String ignored, Seria @MethodSource("serializers") public void shouldCallKeySetWithFilterWhenAllEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2338,7 +2338,7 @@ public void shouldCallKeySetWithFilterWhenAllEntriesMatch(String ignored, Serial @MethodSource("serializers") public void shouldCallKeySetWithFilterWhenNoEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -2370,7 +2370,7 @@ public void shouldCallKeySetWithFilterWhenNoEntriesMatch(String ignored, Seriali @MethodSource("serializers") public void shouldInsertNewEntry(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2398,7 +2398,7 @@ public void shouldInsertNewEntry(String ignored, Serializer serializer, String s @MethodSource("serializers") public void shouldUpdateEntry(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", "value-1"); @@ -2428,7 +2428,7 @@ public void shouldUpdateEntry(String ignored, Serializer serializer, String sSco @MethodSource("serializers") public void shouldUpdateEntryPreviouslyMappedToNull(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", null); @@ -2459,7 +2459,7 @@ public void shouldUpdateEntryPreviouslyMappedToNull(String ignored, Serializer s @MethodSource("serializers") public void shouldUpdateEntryWithNullValue(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); ByteString key = toByteString("key-1", serializer); ByteString value = toByteString(null, serializer); @@ -2491,7 +2491,7 @@ public void shouldUpdateEntryWithNullValue(String ignored, Serializer serializer @MethodSource("serializers") public void shouldPutAll(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2521,7 +2521,7 @@ public void shouldPutAll(String ignored, Serializer serializer, String sScope) t @MethodSource("serializers") public void shouldPutAllWithExpiry(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2555,7 +2555,7 @@ public void shouldPutAllWithExpiry(String ignored, Serializer serializer, String @MethodSource("serializers") public void shouldPutAllWithZeroEntries(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2577,7 +2577,7 @@ public void shouldPutAllWithZeroEntries(String ignored, Serializer serializer, S @MethodSource("serializers") public void shouldPutIfAbsentForNonExistentKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2602,7 +2602,7 @@ public void shouldPutIfAbsentForNonExistentKey(String ignored, Serializer serial @MethodSource("serializers") public void shouldPutIfAbsentForExistingKey(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", "value-1"); @@ -2628,7 +2628,7 @@ public void shouldPutIfAbsentForExistingKey(String ignored, Serializer serialize @MethodSource("serializers") public void shouldPutIfAbsentForExistingKeyMappedToNull(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", null); @@ -2656,7 +2656,7 @@ public void shouldPutIfAbsentForExistingKeyMappedToNull(String ignored, Serializ @MethodSource("serializers") public void shouldRemoveOnNonExistentEntry(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); int count = 10; clearAndPopulate(cache, count); @@ -2681,7 +2681,7 @@ public void shouldRemoveOnNonExistentEntry(String ignored, Serializer serializer public void shouldReturnPreviousValueForRemoveOnExistingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); int cCount = 10; clearAndPopulate(cache, cCount); @@ -2709,7 +2709,7 @@ public void shouldReturnPreviousValueForRemoveOnExistingMapping(String ignored, public void shouldReturnFalseForRemoveMappingOnNonExistentMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2734,7 +2734,7 @@ public void shouldReturnFalseForRemoveMappingOnNonExistentMapping(String ignored public void shouldReturnFalseForRemoveMappingOnNonMatchingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", "value-1"); @@ -2760,7 +2760,7 @@ public void shouldReturnFalseForRemoveMappingOnNonMatchingMapping(String ignored public void shouldReturnTrueForRemoveMappingOnMatchingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); cache.put("key-1", "value-123"); @@ -2788,7 +2788,7 @@ public void shouldReturnTrueForRemoveMappingOnMatchingMapping(String ignored, Se @SuppressWarnings("unchecked") public void shouldRemoveIndexWhenIndexExists(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "add-index-cache"; + String sCacheName = ensureUniqueName("add-index-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); Map indexMap = removeIndexes(cache); @@ -2818,7 +2818,7 @@ public void shouldRemoveIndexWhenIndexExists(String ignored, Serializer serializ @MethodSource("serializers") public void shouldRemoveIndexWhenIndexDoesNotExist(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "add-index-cache"; + String sCacheName = ensureUniqueName("add-index-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); Map indexMap = removeIndexes(cache); @@ -2848,7 +2848,7 @@ public void shouldRemoveIndexWhenIndexDoesNotExist(String ignored, Serializer se public void shouldReturnNullValueForReplaceOnNonExistentMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2874,7 +2874,7 @@ public void shouldReturnNullValueForReplaceOnNonExistentMapping(String ignored, public void shouldReturnNonNullForReplaceOnExistingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -2902,7 +2902,7 @@ public void shouldReturnNonNullForReplaceOnExistingMapping(String ignored, Seria public void shouldReturnFalseForReplaceMappingOnNonExistentMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -2934,7 +2934,7 @@ public void shouldReturnFalseForReplaceMappingOnNonExistentMapping(String ignore public void shouldReturnFalseForReplaceMappingOnNonMatchingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -2968,7 +2968,7 @@ public void shouldReturnFalseForReplaceMappingOnNonMatchingMapping(String ignore public void shouldReturnTrueForReplaceMappingOnMatchingMapping(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -3001,7 +3001,7 @@ public void shouldReturnTrueForReplaceMappingOnMatchingMapping(String ignored, S @MethodSource("serializers") public void shouldGetSizeOfEmptyCache(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); @@ -3022,7 +3022,7 @@ public void shouldGetSizeOfEmptyCache(String ignored, Serializer serializer, Str @MethodSource("serializers") public void shouldGetSizeOfPopulatedCache(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 10); @@ -3045,7 +3045,7 @@ public void shouldGetSizeOfPopulatedCache(String ignored, Serializer serializer, @MethodSource("serializers") public void shouldTruncate(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "test-cache"; + String sCacheName = ensureUniqueName("test-cache"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); clearAndPopulate(cache, 5); @@ -3068,7 +3068,7 @@ public void shouldTruncate(String ignored, Serializer serializer, String sScope) public void shouldCallValuesWithFilterWhenSomeEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -3108,7 +3108,7 @@ public void shouldCallValuesWithFilterWhenSomeEntriesMatch(String ignored, Seria public void shouldCallValuesWithFilterWhenAllEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -3149,7 +3149,7 @@ public void shouldCallValuesWithFilterWhenAllEntriesMatch(String ignored, Serial public void shouldCallValuesWithFilterWhenNoEntriesMatch(String ignored, Serializer serializer, String sScope) throws Exception { - String sCacheName = "people"; + String sCacheName = ensureUniqueName("people"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); Person person1 = new Person("Arthur", "Dent", 25, "male"); @@ -3192,7 +3192,7 @@ public void shouldCallValuesWithFilterAndComparatorWhenSomeEntriesMatch(String String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++) @@ -3239,7 +3239,7 @@ public void shouldCallValuesWithFilterAndComparatorWhenAllEntriesMatch(String String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++) @@ -3283,7 +3283,7 @@ public void shouldCallValuesWithFilterAndComparatorWhenNoEntriesMatch(String String sScope) throws Exception { - String sCacheName = "numbers"; + String sCacheName = ensureUniqueName("numbers"); NamedCache cache = ensureEmptyCache(sScope, sCacheName); cache.clear(); for (int i = 0; i < 100; i++)