commit 02501a1825484d602f9a898f98a54f088016e7b3
author Jörg Hoh <joerghoh@users.noreply.github.com> Mon May 30 12:09:15 2022 +0200
committer GitHub <noreply@github.com> Mon May 30 12:09:15 2022 +0200
tree 3e94cf46363f057d840178359a3c675a5e7d7b2e
parent 03ed49353ba81242c1464696208687117b536bc2
parent 926204aa89a820808cdb0485d6af95096b7b8d9a

Merge pull request #1 from stefan-egli/bugfix/fix-CleanUpTest

SLING-11346 : suggestion to re-add another test variantlet

src/test/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTest.java

diff --git a/src/test/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTest.java b/src/test/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTest.java
index c729b7a..828d524 100644
--- a/src/test/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTest.java
+++ b/src/test/java/org/apache/sling/event/impl/jobs/tasks/CleanUpTest.java
@@ -396,7 +396,16 @@
     }
 
     @Test
-    public void testUnassignedSimple() throws PersistenceException {
+    public void testUnassignedSimple_deleteJob() throws PersistenceException {
+        doTestUnassignedSimple(true, 4); // unassigned/test/2022/05
+    }
+
+    @Test
+    public void testUnassignedSimple_noDeleteJob() throws PersistenceException {
+        doTestUnassignedSimple(false, 8); // unassigned/test/2022/05/17/17/30/test-job
+    }
+
+    private void doTestUnassignedSimple(boolean deleteJob, int expectedFolders) throws PersistenceException {
         Calendar calendar = getCalendarInstance(2022,4,17,17,30); // 2022 May 17, 17:30
         Resource job = createJobResourceForDate(UNASSIGNED_JOBS_JCR_PATH, calendar);
         calendar.add(Calendar.DAY_OF_YEAR,-1);
@@ -411,14 +420,14 @@
         // so counter is still the same
         assertEquals(8, countFolders(UNASSIGNED_JOBS_JCR_PATH));
 
-        deleteResource(job);
+        if (deleteJob) deleteResource(job);
 
         // additional 72 hours
         for( int i = 0; i < 72; i++) {
             simulate(60, Duration.ofMinutes(1));
         }
 
-        assertEquals(4, countFolders(UNASSIGNED_JOBS_JCR_PATH)); // unassigned/test/2022/05
+        assertEquals(expectedFolders, countFolders(UNASSIGNED_JOBS_JCR_PATH));
     }
 
     @Test