Modify import * in RestMLExecuteActionTests, remove root object wrapp…

…er in AnomalyLocalizationOutputTests and LocalSampleCalculatorOutputTest. Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>
nathaliellenaa · Jan 27, 2025 · c2167a3 · c2167a3
1 parent 750633e
commit c2167a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...ensearch/ml/common/output/execute/anomalylocalization/AnomalyLocalizationOutputTests.java b/...ensearch/ml/common/output/execute/anomalylocalization/AnomalyLocalizationOutputTests.java
@@ -47,9 +47,7 @@ public void testWriteable() throws Exception {
     @Test
     public void testXContent() throws Exception {
         XContentBuilder builder = XContentFactory.jsonBuilder();
-        builder.startObject();
         builder = output.toXContent(builder, null);
-        builder.endObject();
         String json = builder.toString();
         XContentParser parser = XContentType.JSON.xContent().createParser(NamedXContentRegistry.EMPTY, null, json);
         AnomalyLocalizationOutput newOutput = AnomalyLocalizationOutput.parse(parser);

diff --git a/...opensearch/ml/common/output/execute/samplecalculator/LocalSampleCalculatorOutputTest.java b/...opensearch/ml/common/output/execute/samplecalculator/LocalSampleCalculatorOutputTest.java
@@ -30,9 +30,7 @@ public void setUp() {
     @Test
     public void toXContent() throws IOException {
         XContentBuilder builder = MediaTypeRegistry.contentBuilder(XContentType.JSON);
-        builder.startObject();
         output.toXContent(builder, ToXContent.EMPTY_PARAMS);
-        builder.endObject();
         String jsonStr = builder.toString();
         assertEquals("{\"result\":1.0}", jsonStr);
     }
@@ -41,9 +39,7 @@ public void toXContent() throws IOException {
     public void toXContent_EmptyOutput() throws IOException {
         LocalSampleCalculatorOutput output = LocalSampleCalculatorOutput.builder().build();
         XContentBuilder builder = MediaTypeRegistry.contentBuilder(XContentType.JSON);
-        builder.startObject();
         output.toXContent(builder, ToXContent.EMPTY_PARAMS);
-        builder.endObject();
         String jsonStr = builder.toString();
         assertEquals("{}", jsonStr);
     }

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMLExecuteActionTests.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMLExecuteActionTests.java
@@ -21,7 +21,11 @@
 import static org.opensearch.ml.utils.TestHelper.getMetricsCorrelationRestRequest;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.junit.Before;
 import org.mockito.ArgumentCaptor;