clear cache before each test

Author: amvanbaren

server/src/test/java/org/eclipse/openvsx/cache/CacheServiceTest.java

@@ -22,9 +22,11 @@
 import org.eclipse.openvsx.security.IdPrincipal;
 import org.eclipse.openvsx.util.TempFile;
 import org.eclipse.openvsx.util.TimeUtil;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -39,8 +41,11 @@
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import static org.eclipse.openvsx.cache.CacheService.CACHE_EXTENSION_JSON;
+import static org.eclipse.openvsx.cache.CacheService.CACHE_AVERAGE_REVIEW_RATING;
 import static org.eclipse.openvsx.entities.FileResource.DOWNLOAD;
 import static org.eclipse.openvsx.entities.FileResource.STORAGE_LOCAL;
 import static org.junit.jupiter.api.Assertions.*;
@@ -70,6 +75,14 @@ class CacheServiceTest {
     @Autowired
     RepositoryService repositories;
 
+    @BeforeEach
+    void beforeEach() {
+       Stream.of(CACHE_EXTENSION_JSON, CACHE_AVERAGE_REVIEW_RATING)
+               .map(name -> cache.getCache(name))
+               .filter(Objects::nonNull)
+               .forEach(Cache::clear);
+    }
+
     @Test
     @Transactional
     void testGetExtension() throws IOException {
@@ -287,8 +300,6 @@ void testAverageReviewRating() throws IOException {
         var user = insertAdmin();
         try (var tempFile = insertExtensionVersion()) {
             // no reviews in database
-            var reviews = repositories.findAllReviews(tempFile.getResource().getExtension().getExtension());
-            assertTrue(reviews.isEmpty());
             assertEquals(0L, repositories.getAverageReviewRating());
 
             var extVersion = tempFile.getResource().getExtension();
@@ -303,7 +314,7 @@ void testAverageReviewRating() throws IOException {
             // returns cached value
             assertEquals(0L, repositories.getAverageReviewRating());
 
-            cache.getCache(CacheService.CACHE_AVERAGE_REVIEW_RATING).clear();
+            cache.getCache(CACHE_AVERAGE_REVIEW_RATING).clear();
 
             // returns new value from database
             assertEquals(3L, repositories.getAverageReviewRating());