testHlrcFromXContent() should respect assertToXContentEquivalence() (#38232)

polyfractal · web-flow · commit 54e684bedde2 · 2019-02-05T12:59:05.000-05:00
Tests can override assertToXContentEquivalence() in case their xcontent cannot be directly compared (e.g. due to insertion order in maps affecting the xcontent ordering). But the `testHlrcFromXContent` test hardcoded the equivalence test to `true` instead of consulting `assertToXContentEquivalence()` Fixes #36034
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/protocol/AbstractHlrcXContentTestCase.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/protocol/AbstractHlrcXContentTestCase.java
@@ -21,7 +21,7 @@ public final void testHlrcFromXContent() throws IOException {
         AbstractXContentTestCase.testFromXContent(NUMBER_OF_TEST_RUNS, this::createTestInstance, supportsUnknownFields(),
             getShuffleFieldsExceptions(), getRandomFieldsExcludeFilter(), this::createParser,
             p -> convertHlrcToInternal(doHlrcParseInstance(p)),
-            this::assertEqualInstances, true, getToXContentParams());
+            this::assertEqualInstances, assertToXContentEquivalence(), getToXContentParams());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public final void testHlrcFromXContent() throws IOException {`
`21`	`21`	`AbstractXContentTestCase.testFromXContent(NUMBER_OF_TEST_RUNS, this::createTestInstance, supportsUnknownFields(),`
`22`	`22`	`getShuffleFieldsExceptions(), getRandomFieldsExcludeFilter(), this::createParser,`
`23`	`23`	`p -> convertHlrcToInternal(doHlrcParseInstance(p)),`
`24`		`- this::assertEqualInstances, true, getToXContentParams());`
	`24`	`+ this::assertEqualInstances, assertToXContentEquivalence(), getToXContentParams());`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/**`