Revert change to AbstractXContentTestCase

Author: JeremyDahlgren

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatsTests.java

@@ -28,6 +28,14 @@ protected SnapshotStats createTestInstance() {
         long incrementalSize = ((long) randomIntBetween(0, Integer.MAX_VALUE)) * 2;
         long totalSize = ((long) randomIntBetween(0, Integer.MAX_VALUE)) * 2;
         long processedSize = ((long) randomIntBetween(0, Integer.MAX_VALUE)) * 2;
+
+        // toXContent() omits the "processed" sub-object if processedFileCount == incrementalFileCount, so here we increase the probability
+        // of that scenario so we can make sure the processed values are set as expected in fromXContent().
+        if (randomBoolean()) {
+            processedFileCount = incrementalFileCount;
+            processedSize = incrementalSize;
+        }
+
         return new SnapshotStats(
             startTime,
             time,
@@ -40,26 +48,6 @@ protected SnapshotStats createTestInstance() {
         );
     }
 
-    public void testXContentSerializationWhenProcessedFileCountEqualsIncrementalFileCount() throws IOException {
-        final var instance = createTestInstance();
-        final var incrementalSameAsProcessed = new SnapshotStats(
-            instance.getStartTime(),
-            instance.getTime(),
-            instance.getIncrementalFileCount(),
-            instance.getTotalFileCount(),
-            instance.getIncrementalFileCount(), // processedFileCount
-            instance.getIncrementalSize(),
-            instance.getTotalSize(),
-            instance.getIncrementalSize() // processedSize
-        );
-        // toXContent() omits the "processed" sub-object in this case, make sure the processed values are set as expected in fromXContent().
-        testFromXContent(() -> incrementalSameAsProcessed);
-    }
-
-    public void testXContentSerializationForEmptyStats() throws IOException {
-        testFromXContent(SnapshotStats::new);
-    }
-
     @Override
     protected SnapshotStats doParseInstance(XContentParser parser) throws IOException {
         return fromXContent(parser);

test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java

@@ -284,16 +284,9 @@ public static <T extends ToXContent> void testFromXContent(
      * both for equality and asserts equality on the two queries.
      */
     public final void testFromXContent() throws IOException {
-        testFromXContent(this::createTestInstance);
-    }
-
-    /**
-     * Generic test that creates a new instance using the given supplier and verifies XContent round trip serialization.
-     */
-    public final void testFromXContent(Supplier<T> testInstanceSupplier) throws IOException {
         testFromXContent(
             NUMBER_OF_TEST_RUNS,
-            testInstanceSupplier,
+            this::createTestInstance,
             supportsUnknownFields(),
             getShuffleFieldsExceptions(),
             getRandomFieldsExcludeFilter(),