refactor: minimize flaky test

Author: marcelogpinheiro

src/integration-test/java/com/commercetools/sync/integration/commons/utils/CategoryITUtils.java

@@ -331,6 +331,10 @@ public static void deleteCategoriesBySlug(
       @Nonnull final ProjectApiRoot ctpClient,
       @Nonnull final Locale locale,
       @Nonnull final List<String> slugs) {
+    if (slugs == null || slugs.isEmpty()) {
+      return;
+    }
+
     for (String slug : slugs) {
       try {
         ctpClient
@@ -354,18 +358,21 @@ public static void deleteCategoriesBySlug(
                         .execute()
                         .toCompletableFuture()
                         .join();
+                  } catch (NotFoundException e) {
+                    // Already deleted
+                    logger.debug(
+                      "Category with slug '{}' already deleted", slug);
+
                   } catch (RuntimeException e) {
-                    // Expected: already deleted, cascade deleted, or version conflict
+                    // May have been deleted by parent cascade or version conflict
                     logger.debug(
-                        "Could not delete category with slug '{}', ID: {}. Reason: {}",
-                        slug,
-                        cat.getId(),
-                        e.getMessage());
+                        "Could not delete category with slug '{}', ID: {}", slug, cat.getId());
                   }
                 });
       } catch (RuntimeException e) {
-        // Expected: slug doesn't exist or query failed
-        logger.debug("Could not query categories with slug '{}'. Reason: {}", slug, e.getMessage());
+        // Slug doesn't exist or query failed - this is expected
+        logger.debug(
+            "Category with slug '{}' does not exist", slug);
       }
     }
   }

src/integration-test/java/com/commercetools/sync/integration/ctpprojectsource/categories/CategorySyncIT.java

@@ -68,16 +68,6 @@ void setupTest() {
     CategoryITUtils.deleteAllCategories(TestClientUtils.CTP_TARGET_CLIENT);
     CategoryITUtils.deleteAllCategories(TestClientUtils.CTP_SOURCE_CLIENT);
 
-    // Force delete any orphaned categories with specific slugs that deleteAllCategories might miss
-    CategoryITUtils.deleteCategoriesBySlug(
-        TestClientUtils.CTP_TARGET_CLIENT,
-        Locale.ENGLISH,
-        List.of("furniture1-project-source", "furniture2-project-source"));
-    CategoryITUtils.deleteCategoriesBySlug(
-        TestClientUtils.CTP_SOURCE_CLIENT,
-        Locale.ENGLISH,
-        List.of("furniture1-project-source", "furniture2-project-source"));
-
     CategoryITUtils.ensureCategories(
         TestClientUtils.CTP_TARGET_CLIENT, CategoryITUtils.getCategoryDrafts(null, 2, true));
 
@@ -108,7 +98,7 @@ private CategorySyncOptions buildCategorySyncOptions(final int batchSize) {
    */
   @AfterEach
   void cleanupAfterTest() {
-    // Clean up, including any categories without keys
+    // Clean up specific problematic slugs first (categories without keys from failed tests)
     CategoryITUtils.deleteCategoriesBySlug(
         TestClientUtils.CTP_TARGET_CLIENT,
         Locale.ENGLISH,
@@ -117,7 +107,8 @@ void cleanupAfterTest() {
         TestClientUtils.CTP_SOURCE_CLIENT,
         Locale.ENGLISH,
         List.of("furniture1-project-source", "furniture2-project-source"));
-
+    
+    // Then clean up everything else
     CategoryITUtils.deleteAllCategories(TestClientUtils.CTP_TARGET_CLIENT);
     CategoryITUtils.deleteAllCategories(TestClientUtils.CTP_SOURCE_CLIENT);
   }
@@ -516,14 +507,13 @@ void syncDrafts_fromCategoriesWithoutKeys_ShouldNotUpdateCategories() {
     CompletableFuture.allOf(futureCreations.toArray(new CompletableFuture[futureCreations.size()]))
         .join();
 
-    // Create two categories in the target without Keys (sequentially to avoid race conditions).
+    // Create two categories in the target without Keys.
     final CategoryDraft newCategoryDraft1 =
         CategoryDraftBuilder.of(oldCategoryDraft1).key(null).build();
     final CategoryDraft newCategoryDraft2 =
         CategoryDraftBuilder.of(oldCategoryDraft2).key(null).build();
 
     TestClientUtils.CTP_TARGET_CLIENT.categories().create(newCategoryDraft1).executeBlocking();
-
     TestClientUtils.CTP_TARGET_CLIENT.categories().create(newCategoryDraft2).executeBlocking();
 
     // ---------