From fca1eef2c1871c6c084e1d6ede3c2dc4843af3f8 Mon Sep 17 00:00:00 2001 From: Andrii Landiak Date: Tue, 16 Jul 2024 14:54:12 +0300 Subject: [PATCH] Improve RedisTbTransactionalCacheTest --- .../cache/RedisTbTransactionalCacheTest.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java index 914472098c..12b6f5d7d1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java @@ -16,7 +16,6 @@ package org.thingsboard.server.dao.cache; import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.mock.mockito.MockBean; @@ -60,23 +59,17 @@ public class RedisTbTransactionalCacheTest { @MockBean private RedisSslCredentials redisSslCredentials; - - @BeforeEach - public void setup() { + @Test + public void testNoOpWhenCacheDisabled() { when(connectionFactory.getConnection()).thenReturn(redisConnection); - } - @Test - public void testEvictNoOpWhenCacheDisabled() { + relationRedisCache.put(createRelationCacheKey(), null); + relationRedisCache.putIfAbsent(createRelationCacheKey(), null); + relationRedisCache.evict(createRelationCacheKey()); relationRedisCache.evict(List.of(createRelationCacheKey())); - - verify(connectionFactory, never()).getConnection(); - verifyNoInteractions(redisConnection); - } - - @Test - public void testEvictOrPutNoOpWhenCacheDisabled() { - relationRedisCache.evictOrPut(createRelationCacheKey(), null); + relationRedisCache.getAndPutInTransaction(createRelationCacheKey(), null, false); + relationRedisCache.getAndPutInTransaction(createRelationCacheKey(), null, null, null, false); + relationRedisCache.getOrFetchFromDB(createRelationCacheKey(), null, false, false); verify(connectionFactory, never()).getConnection(); verifyNoInteractions(redisConnection); @@ -86,4 +79,4 @@ public class RedisTbTransactionalCacheTest { return new RelationCacheKey(new DeviceId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), null, RelationTypeGroup.COMMON); } -} \ No newline at end of file +}