Skip to content

Commit cdd07d2

Browse files
committed
Fix integration tests
1 parent c37c3bb commit cdd07d2

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
package org.junit.platform.reporting.open.xml;
1212

13+
import static org.apiguardian.api.API.Status.EXPERIMENTAL;
1314
import static org.junit.platform.reporting.open.xml.JUnitFactory.legacyReportingName;
1415
import static org.junit.platform.reporting.open.xml.JUnitFactory.type;
1516
import static org.junit.platform.reporting.open.xml.JUnitFactory.uniqueId;
@@ -51,6 +52,7 @@
5152
import java.util.concurrent.ConcurrentHashMap;
5253
import java.util.concurrent.atomic.AtomicInteger;
5354

55+
import org.apiguardian.api.API;
5456
import org.junit.platform.commons.JUnitException;
5557
import org.junit.platform.commons.util.StringUtils;
5658
import org.junit.platform.engine.ConfigurationParameters;
@@ -77,6 +79,12 @@
7779
import org.opentest4j.reporting.events.root.Events;
7880
import org.opentest4j.reporting.schema.Namespace;
7981

82+
/**
83+
* Open Test Reporting events XML generating test execution listener.
84+
*
85+
* @since 1.9
86+
*/
87+
@API(status = EXPERIMENTAL, since = "1.9")
8088
public class OpenTestReportGeneratingListener implements TestExecutionListener {
8189

8290
static final String ENABLED_PROPERTY_NAME = "junit.platform.reporting.open.xml.enabled";
@@ -106,7 +114,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
106114
reportInfrastructure();
107115
}
108116
catch (Exception e) {
109-
throw new RuntimeException("Failed to initialize XML events file: " + eventsXml, e);
117+
throw new JUnitException("Failed to initialize XML events file: " + eventsXml, e);
110118
}
111119
}
112120
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
org.junit.platform.reporting@${platformVersion} jar:file:.+/junit-platform-reporting-\d.+\.jar..module-info\.class
22
exports org.junit.platform.reporting.legacy
33
exports org.junit.platform.reporting.legacy.xml
4+
exports org.junit.platform.reporting.open.xml
45
requires java.base mandated
56
requires java.xml
67
requires org.apiguardian.api static transitive
78
requires org.junit.platform.commons
89
requires org.junit.platform.engine transitive
910
requires org.junit.platform.launcher transitive
11+
provides org.junit.platform.launcher.TestExecutionListener with org.junit.platform.reporting.open.xml.OpenTestReportGeneratingListener

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ArchUnitTests.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.tngtech.archunit.core.domain.JavaModifier.PUBLIC;
2121
import static com.tngtech.archunit.core.domain.properties.HasModifiers.Predicates.modifier;
2222
import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.name;
23+
import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.nameContaining;
2324
import static com.tngtech.archunit.lang.conditions.ArchPredicates.are;
2425
import static com.tngtech.archunit.lang.conditions.ArchPredicates.have;
2526
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
@@ -73,7 +74,8 @@ void avoidJavaUtilLogging(JavaClasses classes) {
7374
@ArchTest
7475
void avoidThrowingGenericExceptions(JavaClasses classes) {
7576
// LoggerFactory.java:155 -> new Throwable()
76-
var subset = classes.that(are(not(name("org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger"))));
77+
var subset = classes.that(are(not(
78+
name("org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger").or(nameContaining(".shadow.")))));
7779
GeneralCodingRules.NO_CLASSES_SHOULD_THROW_GENERIC_EXCEPTIONS.check(subset);
7880
}
7981

0 commit comments

Comments
 (0)