resolve flakiness

Signed-off-by: Kiran Prakash <[email protected]>

server/src/test/java/org/opensearch/search/sandboxing/cancellation/DefaultTaskCancellationTests.java

@@ -29,7 +29,7 @@
 
 public class DefaultTaskCancellationTests extends OpenSearchTestCase {
 
-    private class TestTaskCancellationImpl extends DefaultTaskCancellation {
+    private static class TestTaskCancellationImpl extends DefaultTaskCancellation {
 
         public TestTaskCancellationImpl(
             TaskSelectionStrategy taskSelectionStrategy,
@@ -75,8 +75,8 @@ public void testGetCancellableTasksFrom_returnsTasksWhenBreachingThreshold() {
 
         List<TaskCancellation> cancellableTasksFrom = taskCancellation.getCancellableTasksFrom(sandbox1);
         assertEquals(2, cancellableTasksFrom.size());
-        assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId());
-        assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId());
+        assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId());
+        assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId());
     }
 
     public void testGetCancellableTasksFrom_returnsNoTasksWhenBreachingThreshold() {
@@ -115,8 +115,8 @@ public void testCancelTasks_cancelsGivenTasks() {
 
         List<TaskCancellation> cancellableTasksFrom = taskCancellation.getAllCancellableTasks();
         assertEquals(2, cancellableTasksFrom.size());
-        assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId());
-        assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId());
+        assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId());
+        assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId());
 
         taskCancellation.cancelTasks();
         assertTrue(cancellableTasksFrom.get(0).getTask().isCancelled());
@@ -153,8 +153,8 @@ public void testGetAllCancellableTasks_ReturnsTasksWhenBreachingThresholds() {
 
         List<TaskCancellation> allCancellableTasks = taskCancellation.getAllCancellableTasks();
         assertEquals(2, allCancellableTasks.size());
-        assertEquals(4321, allCancellableTasks.get(0).getTask().getId());
-        assertEquals(1234, allCancellableTasks.get(1).getTask().getId());
+        assertEquals(1234, allCancellableTasks.get(0).getTask().getId());
+        assertEquals(4321, allCancellableTasks.get(1).getTask().getId());
     }
 
     public void testGetCancellableTasksFrom_returnsTasksEvenWhenSandboxIdNotFound() {
@@ -174,7 +174,7 @@ public void testGetCancellableTasksFrom_returnsTasksEvenWhenSandboxIdNotFound()
 
         List<TaskCancellation> cancellableTasksFrom = taskCancellation.getCancellableTasksFrom(sandbox1);
         assertEquals(2, cancellableTasksFrom.size());
-        assertEquals(4321, cancellableTasksFrom.get(0).getTask().getId());
-        assertEquals(1234, cancellableTasksFrom.get(1).getTask().getId());
+        assertEquals(1234, cancellableTasksFrom.get(0).getTask().getId());
+        assertEquals(4321, cancellableTasksFrom.get(1).getTask().getId());
     }
 }

server/src/test/java/org/opensearch/search/sandboxing/cancellation/ShortestRunningTaskFirstStrategyStrategyTests.java

@@ -29,6 +29,6 @@ public void testSortingCondition() {
         List<Task> tasks = Arrays.asList(task1, task3, task2);
         tasks.sort(new ShortestRunningTaskFirstStrategy().sortingCondition());
 
-        assertEquals(Arrays.asList(task1, task2, task3), tasks);
+        assertEquals(Arrays.asList(task3, task2, task1), tasks);
     }
 }

server/src/test/java/org/opensearch/search/sandboxing/cancellation/TaskSelectionStrategyTests.java

@@ -22,7 +22,7 @@ public class TaskSelectionStrategyTests extends OpenSearchTestCase {
     public static class TestTaskSelectionStrategy extends AbstractTaskSelectionStrategy {
         @Override
         public Comparator<Task> sortingCondition() {
-            return Comparator.comparingLong(Task::getStartTime).reversed();
+            return Comparator.comparingLong(Task::getId);
         }
     }