Refactor test cleanup logic and improve resilience

Moved task cleanup logic to a shared method in BaseApiTest for reuse and improved error handling during cleanup. TaskApiTest now also cleans up the 'man' vertex label after tests. Cleanup methods are more resilient to exceptions, ensuring test environments are reliably reset.

Author: imbajin

hugegraph-client/src/test/java/org/apache/hugegraph/api/BaseApiTest.java

@@ -103,43 +103,48 @@ public static void clear() throws Exception {
 
     protected static void clearData() {
         // Clear edge
-        edgeAPI.list(-1).results().forEach(edge -> {
-            edgeAPI.delete(edge.id());
-        });
+        edgeAPI.list(-1).results().forEach(edge -> edgeAPI.delete(edge.id()));
+
         // Clear vertex
-        vertexAPI.list(-1).results().forEach(vertex -> {
-            vertexAPI.delete(vertex.id());
-        });
+        vertexAPI.list(-1).results().forEach(vertex -> vertexAPI.delete(vertex.id()));
 
-        // Clear schema
+        // Clear schema (order matters: index -> edge -> vertex -> property)
         List<Long> ilTaskIds = new ArrayList<>();
-        indexLabelAPI.list().forEach(indexLabel -> {
-            ilTaskIds.add(indexLabelAPI.delete(indexLabel.name()));
-        });
+        indexLabelAPI.list().forEach(il -> ilTaskIds.add(indexLabelAPI.delete(il.name())));
         ilTaskIds.forEach(BaseApiTest::waitUntilTaskCompleted);
 
         List<Long> elTaskIds = new ArrayList<>();
-        edgeLabelAPI.list().forEach(edgeLabel -> {
-            elTaskIds.add(edgeLabelAPI.delete(edgeLabel.name()));
-        });
+        edgeLabelAPI.list().forEach(el -> elTaskIds.add(edgeLabelAPI.delete(el.name())));
         elTaskIds.forEach(BaseApiTest::waitUntilTaskCompleted);
 
         List<Long> vlTaskIds = new ArrayList<>();
-        vertexLabelAPI.list().forEach(vertexLabel -> {
-            vlTaskIds.add(vertexLabelAPI.delete(vertexLabel.name()));
-        });
+        vertexLabelAPI.list().forEach(vl -> vlTaskIds.add(vertexLabelAPI.delete(vl.name())));
         // Vertex label deletion may take longer, use extended timeout
         vlTaskIds.forEach(taskId -> waitUntilTaskCompleted(taskId, 30));
 
         List<Long> pkTaskIds = new ArrayList<>();
-        propertyKeyAPI.list().forEach(propertyKey -> {
-            pkTaskIds.add(propertyKeyAPI.delete(propertyKey.name()));
-        });
+        propertyKeyAPI.list().forEach(pk -> pkTaskIds.add(propertyKeyAPI.delete(pk.name())));
         pkTaskIds.forEach(BaseApiTest::waitUntilTaskCompleted);
 
-        // Clear system
+        // Clear all tasks (cancel running ones first)
+        cleanupTasks();
+    }
+
+    protected static void cleanupTasks() {
         taskAPI.list(null, -1).forEach(task -> {
-            taskAPI.delete(task.id());
+            if (!task.completed()) {
+                try {
+                    taskAPI.cancel(task.id());
+                    Thread.sleep(1000);
+                } catch (Exception ignored) {
+                    // Task may have completed during cancellation
+                }
+            }
+            try {
+                taskAPI.delete(task.id());
+            } catch (Exception ignored) {
+                // Task may have been deleted by another process
+            }
         });
     }
 
@@ -154,7 +159,13 @@ protected static void waitUntilTaskCompleted(long taskId, long timeout) {
         if (taskId == 0L) {
             return;
         }
-        taskAPI.waitUntilTaskSuccess(taskId, timeout);
+        try {
+            taskAPI.waitUntilTaskSuccess(taskId, timeout);
+        } catch (Exception e) {
+            // Cleanup should be resilient - log warning but continue
+            System.err.println("Warning: Task " + taskId +
+                               " did not complete successfully: " + e.getMessage());
+        }
     }
 
     protected RestClient client() {

hugegraph-client/src/test/java/org/apache/hugegraph/api/JobApiTest.java

@@ -38,19 +38,7 @@ public static void prepareSchema() {
 
     @After
     public void teardown() throws Exception {
-        taskAPI.list(null, -1).forEach(task -> {
-            // Cancel running/cancelling tasks before deletion
-            if (!task.completed()) {
-                try {
-                    taskAPI.cancel(task.id());
-                    // Wait for cancellation to complete
-                    Thread.sleep(1000);
-                } catch (Exception e) {
-                    // Ignore if already completed or cancellation fails
-                }
-            }
-            taskAPI.delete(task.id());
-        });
+        cleanupTasks();
     }
 
     @Test

hugegraph-client/src/test/java/org/apache/hugegraph/api/TaskApiTest.java

@@ -46,19 +46,26 @@ public static void prepareSchema() {
 
     @After
     public void teardown() throws Exception {
-        taskAPI.list(null, -1).forEach(task -> {
-            // Cancel running/cancelling tasks before deletion
-            if (!task.completed()) {
-                try {
-                    taskAPI.cancel(task.id());
-                    // Wait for cancellation to complete
-                    Thread.sleep(1000);
-                } catch (Exception e) {
-                    // Ignore if already completed or cancellation fails
+        // Clean up all tasks (especially async tasks from testCancel)
+        cleanupTasks();
+        
+        // Clean up 'man' vertex label created in testCancel
+        cleanupManVertexLabel();
+    }
+
+    private void cleanupManVertexLabel() {
+        try {
+            if (schema().getVertexLabel("man") != null) {
+                // Drop vertices first, then delete label
+                gremlin().execute(new GremlinRequest("g.V().hasLabel('man').drop()"));
+                long taskId = vertexLabelAPI.delete("man");
+                if (taskId != 0L) {
+                    waitUntilTaskCompleted(taskId, 30);
                 }
             }
-            taskAPI.delete(task.id());
-        });
+        } catch (Exception ignored) {
+            // Label may not exist or already deleted
+        }
     }
 
     @Test
@@ -221,15 +228,13 @@ public void testCancel() {
         schema().vertexLabel("man").useAutomaticId().ifNotExist().create();
 
         // Clean up any existing 'man' vertices from previous tests
-        String groovy = "g.V().hasLabel('man').drop()";
-        GremlinRequest request = new GremlinRequest(groovy);
-        gremlin().execute(request);
+        gremlin().execute(new GremlinRequest("g.V().hasLabel('man').drop()"));
 
-        groovy = "for (int i = 0; i < 10; i++) {" +
-                 "g.addV('man').iterate();" +
-                 "}";
         // Insert 10 records in sync mode
-        request = new GremlinRequest(groovy);
+        String groovy = "for (int i = 0; i < 10; i++) {" +
+                        "g.addV('man').iterate();" +
+                        "}";
+        GremlinRequest request = new GremlinRequest(groovy);
         gremlin().execute(request);
         // Verify insertion takes effect
         groovy = "g.V()";