Skip to content

Commit eb22efb

Browse files
Fix Failing Tests
Signed-off-by: Kiran Prakash <[email protected]>
1 parent 225c31a commit eb22efb

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

server/src/main/java/org/opensearch/search/sandboxing/resourcetype/CpuTimeResourceType.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,13 @@ public class CpuTimeResourceType extends SandboxResourceType {
1515
public long getResourceUsage(Task task) {
1616
return task.getTotalResourceStats().getCpuTimeInNanos();
1717
}
18+
@Override
19+
public boolean equals(Object obj) {
20+
return obj instanceof CpuTimeResourceType;
21+
}
22+
23+
@Override
24+
public int hashCode() {
25+
return "CPU".hashCode();
26+
}
1827
}

server/src/main/java/org/opensearch/search/sandboxing/resourcetype/JvmMemoryResourceType.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,13 @@ public class JvmMemoryResourceType extends SandboxResourceType {
1515
public long getResourceUsage(Task task) {
1616
return task.getTotalResourceStats().getMemoryInBytes();
1717
}
18+
@Override
19+
public boolean equals(Object obj) {
20+
return obj instanceof JvmMemoryResourceType;
21+
}
22+
23+
@Override
24+
public int hashCode() {
25+
return "JVM".hashCode();
26+
}
1827
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,12 @@
1313
import org.opensearch.core.tasks.resourcetracker.ResourceStats;
1414
import org.opensearch.core.tasks.resourcetracker.ResourceStatsType;
1515
import org.opensearch.core.tasks.resourcetracker.ResourceUsageMetric;
16-
import org.opensearch.core.tasks.resourcetracker.TaskResourceUsage;
17-
import org.opensearch.tasks.CancellableTask;
1816
import org.opensearch.tasks.Task;
19-
import org.opensearch.test.OpenSearchTestCase;
2017

2118
import java.util.ArrayList;
2219
import java.util.Collections;
2320
import java.util.List;
24-
import java.util.concurrent.atomic.AtomicBoolean;
2521

26-
import static org.mockito.ArgumentMatchers.anyString;
27-
import static org.mockito.Mockito.doAnswer;
28-
import static org.mockito.Mockito.mock;
29-
import static org.mockito.Mockito.when;
3022
import static org.opensearch.test.OpenSearchTestCase.randomLong;
3123
import static org.opensearch.test.OpenSearchTestCase.randomLongBetween;
3224

0 commit comments

Comments
 (0)