From acbb4828a726ea325a5126df3349006fb4ce4418 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 24 Apr 2023 12:32:28 -0400 Subject: [PATCH] `TestResultTest` can just reuse `TestResultAction.XSTREAM` --- .../java/hudson/tasks/junit/TestResultTest.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/test/java/hudson/tasks/junit/TestResultTest.java b/src/test/java/hudson/tasks/junit/TestResultTest.java index c82cf22f1..ee64f6ccf 100644 --- a/src/test/java/hudson/tasks/junit/TestResultTest.java +++ b/src/test/java/hudson/tasks/junit/TestResultTest.java @@ -25,8 +25,6 @@ import hudson.XmlFile; import hudson.tasks.test.PipelineTestDetails; -import hudson.util.HeapSpaceStringConverter; -import hudson.util.XStream2; import java.io.File; import java.io.IOException; @@ -40,7 +38,6 @@ import org.apache.tools.ant.DirectoryScanner; import org.junit.Test; -import com.thoughtworks.xstream.XStream; import org.jvnet.hudson.test.Issue; import static org.junit.Assert.assertEquals; @@ -83,7 +80,7 @@ public void testIpsTests() throws Exception { */ @Test public void testXmlCompatibility() throws Exception { - XmlFile xmlFile = new XmlFile(XSTREAM, getDataFile("junitResult.xml")); + XmlFile xmlFile = new XmlFile(TestResultAction.XSTREAM, getDataFile("junitResult.xml")); TestResult result = (TestResult)xmlFile.read(); // Regenerate the transient data @@ -326,12 +323,4 @@ public void parseOldReports() throws Exception { } - private static final XStream XSTREAM = new XStream2(); - - static { - XSTREAM.alias("result",TestResult.class); - XSTREAM.alias("suite",SuiteResult.class); - XSTREAM.alias("case",CaseResult.class); - XSTREAM.registerConverter(new HeapSpaceStringConverter(),100); - } }