Merge branch '2165-when-adding-refresh-task-don-t-allow-for-duplicates' into merge-18.0.8

service/src/test/java/lcsb/mapviewer/services/impl/MinervaJobServiceTest.java

@@ -71,28 +71,35 @@ public class MinervaJobServiceTest extends TestUtils {
   }
 
   @Test
-  public void testRefreshTask() {
-    CacheQuery entry = cache.getByQuery(query, type);
-    if (entry != null) {
-      cache.delete(entry);
+  public void testRefreshTask() throws Exception {
+    for (int i = 0; i < 5; i++) {
+      CacheQuery entry = cache.getByQuery(query + "?" + i, type);
+      if (entry != null) {
+        cache.delete(entry);
+      }
     }
 
-    final MinervaJobParameters params = new CacheQueryMinervaJob(query, type.getId());
-
-    minervaJobService.addJob(new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, params));
-    minervaJobService.addJob(new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, params));
-    minervaJobService.addJob(new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, params));
-    minervaJobService.addJob(new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.LOWEST, params));
-    minervaJobService.addJob(new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.HIGH, params));
+    minervaJobService.addJob(
+        new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, new CacheQueryMinervaJob(query + "?0", type.getId())));
+    minervaJobService.addJob(
+        new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, new CacheQueryMinervaJob(query + "?1", type.getId())));
+    minervaJobService.addJob(
+        new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.MEDIUM, new CacheQueryMinervaJob(query + "?2", type.getId())));
+    minervaJobService.addJob(
+        new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.LOWEST, new CacheQueryMinervaJob(query + "?3", type.getId())));
+    minervaJobService.addJob(
+        new MinervaJob(MinervaJobType.REFRESH_CACHE, MinervaJobPriority.HIGH, new CacheQueryMinervaJob(query + "?4", type.getId())));
 
     minervaJobService.waitForTasksToFinish();
 
-    entry = cache.getByQuery(query, type);
+    for (int i = 0; i < 5; i++) {
+      CacheQuery entry = cache.getByQuery(query + "?" + i, type);
 
-    assertNotNull(entry);
+      assertNotNull(entry);
 
-    assertTrue(Calendar.getInstance().before(entry.getExpires()));
-    final List<MinervaJob> jobs = minervaJobService.getAllJobs();
+      assertTrue(Calendar.getInstance().before(entry.getExpires()));
+    }
+    List<MinervaJob> jobs = minervaJobService.getAllJobs();
     MinervaJob low = null;
     MinervaJob high = null;
     for (final MinervaJob minervaJob : jobs) {