Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TestResultTest can just reuse TestResultAction.XSTREAM #522

Merged
merged 1 commit into from
Apr 24, 2023
Merged

TestResultTest can just reuse TestResultAction.XSTREAM #522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions src/test/java/hudson/tasks/junit/TestResultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
}