Issue #23507 TCK runner now uses junit5 instead of junit4
diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml
index 3b295f0..840f35a 100644
--- a/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml
+++ b/appserver/tests/tck/embedded_ejb_smoke/runner/pom.xml
@@ -72,6 +72,11 @@
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
@@ -109,8 +114,8 @@
<configuration>
<systemPropertyVariables>
<tck.home>${tck.home}</tck.home>
- <glassfish.home>${glassfish.home}</glassfish.home>
- <glassfish.version>${project.version}</glassfish.version>
+ <glassfish.home>${glassfish.home}</glassfish.home>
+ <glassfish.version>${project.version}</glassfish.version>
<maven.tck.debug>${tck.debug}</maven.tck.debug>
</systemPropertyVariables>
</configuration>
diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerTest.java b/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerTest.java
index e68d671..31aa7e6 100644
--- a/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerTest.java
+++ b/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerTest.java
@@ -15,8 +15,8 @@
*/
package com.sun.ts.run;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static org.junit.Assert.fail;
+import com.sun.javatest.Status;
+import com.sun.ts.lib.harness.ExecTSTestCmd;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -28,10 +28,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import com.sun.javatest.Status;
-import com.sun.ts.lib.harness.ExecTSTestCmd;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.junit.jupiter.api.Assertions.fail;
public class EmbeddedRunnerTest {
@@ -51,10 +51,8 @@
try {
Status status = cmd.run(arguments.toArray(String[]::new), log, ref);
-
- System.out.println(status.getReason());
if (!status.isPassed()) {
- fail();
+ fail(status.getReason());
}
} finally {