Skip to content

Commit b449f21

Browse files
authored
Convert CCSTelemetrySnapshotTests to use assertToXContentEquivalent (#112370)
1 parent ac735af commit b449f21

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

server/src/test/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshotTests.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010

1111
import org.elasticsearch.action.admin.cluster.stats.CCSTelemetrySnapshot.PerClusterCCSTelemetry;
1212
import org.elasticsearch.action.admin.cluster.stats.LongMetric.LongMetricValue;
13+
import org.elasticsearch.common.bytes.BytesArray;
1314
import org.elasticsearch.common.io.stream.Writeable;
15+
import org.elasticsearch.common.xcontent.XContentHelper;
1416
import org.elasticsearch.core.Tuple;
1517
import org.elasticsearch.test.AbstractWireSerializingTestCase;
18+
import org.elasticsearch.xcontent.XContentType;
1619

1720
import java.io.IOException;
1821
import java.io.InputStream;
@@ -21,6 +24,7 @@
2124
import java.util.Map;
2225
import java.util.TreeMap;
2326

27+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent;
2428
import static org.hamcrest.Matchers.closeTo;
2529
import static org.hamcrest.Matchers.equalTo;
2630

@@ -309,8 +313,12 @@ public void testToXContent() throws IOException {
309313
clientCounts,
310314
perClusterCCSTelemetries
311315
);
312-
String expected = readJSONFromResource("telemetry_test.json");
313-
assertEquals(expected, snapshot.toString());
316+
String expectedJson = readJSONFromResource("telemetry_test.json");
317+
assertToXContentEquivalent(
318+
new BytesArray(expectedJson),
319+
XContentHelper.toXContent(snapshot, XContentType.JSON, randomBoolean()),
320+
XContentType.JSON
321+
);
314322
}
315323

316324
private String readJSONFromResource(String fileName) throws IOException {

0 commit comments

Comments
 (0)