Skip to content

Commit 814727d

Browse files
committed
Added JUnit 6 to platform
1 parent e3f59f8 commit 814727d

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.test; singleton:=true
5-
Bundle-Version: 3.6.300.qualifier
5+
Bundle-Version: 3.6.400.qualifier
66
Eclipse-BundleShape: dir
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
@@ -20,7 +20,6 @@ Import-Package: org.junit.jupiter.api,
2020
org.junit.platform.launcher,
2121
org.junit.platform.launcher.core,
2222
org.junit.platform.commons,
23-
org.junit.platform.commons.util,
2423
org.junit.jupiter.engine
2524
Bundle-ActivationPolicy: lazy
2625
Bundle-RequiredExecutionEnvironment: JavaSE-17

eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
import java.io.IOException;
1717
import java.io.OutputStream;
18+
import java.io.PrintWriter;
1819
import java.io.Reader;
20+
import java.io.StringWriter;
1921
import java.util.Date;
2022
import java.util.Map;
2123
import java.util.Optional;
@@ -31,7 +33,6 @@
3133
import org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter;
3234
import org.apache.tools.ant.util.DOMElementWriter;
3335
import org.apache.tools.ant.util.DateUtils;
34-
import org.junit.platform.commons.util.ExceptionUtils;
3536
import org.junit.platform.engine.TestExecutionResult;
3637
import org.junit.platform.engine.TestSource;
3738
import org.junit.platform.engine.reporting.ReportEntry;
@@ -333,7 +334,11 @@ private static void writeIfPresentInMap(XMLStreamWriter writer, TestIdentifier t
333334
writer.writeAttribute(ATTR_TYPE, t.getClass().getName());
334335

335336
if (writeExceptionStackTrace) {
336-
writer.writeCharacters(ExceptionUtils.readStackTrace(t));
337+
StringWriter stringWriter = new StringWriter();
338+
try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
339+
t.printStackTrace(printWriter);
340+
}
341+
writer.writeCharacters(stringWriter.toString());
337342
}
338343
}
339344
writer.writeEndElement();

eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.sdk.tests"
44
label="%featureName"
5-
version="4.38.0.qualifier"
5+
version="4.38.100.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.test"
44
label="%featureName"
5-
version="3.9.400.qualifier"
5+
version="3.9.500.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

0 commit comments

Comments
 (0)