Skip to content

Commit 1f62986

Browse files
author
Andrei Stryhelski
committed
Migrate junit4 to junit5
DEVSIX-8345
1 parent 7992046 commit 1f62986

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

pdftest/src/main/java/com/itextpdf/test/WrappedSamplesRunner.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.test;
2424

25-
import org.junit.Assert;
26-
import org.junit.Assume;
27-
import org.junit.runner.RunWith;
28-
import org.junit.runners.Parameterized;
2925

3026
import java.io.File;
3127
import java.lang.reflect.Field;
@@ -36,11 +32,11 @@ This file is part of the iText (R) project.
3632
import java.util.ArrayList;
3733
import java.util.Collection;
3834
import java.util.List;
35+
import org.junit.jupiter.api.Assertions;
36+
import org.junit.jupiter.api.Assumptions;
3937

40-
@RunWith(Parameterized.class)
4138
public abstract class WrappedSamplesRunner {
4239

43-
@Parameterized.Parameter
4440
public RunnerParams sampleClassParams;
4541

4642
protected Class<?> sampleClass;
@@ -69,7 +65,7 @@ public static Collection<Object[]> generateTestsList(RunnerSearchConfig searchCo
6965
}
7066

7167
public void runSamples() throws Exception {
72-
Assume.assumeTrue(sampleClassParams.ignoreMessage, sampleClassParams.ignoreMessage == null);
68+
Assumptions.assumeTrue(sampleClassParams.ignoreMessage == null, sampleClassParams.ignoreMessage);
7369

7470
initClass();
7571
System.out.println("Starting test " + sampleClassParams);
@@ -89,7 +85,7 @@ public void runSamples() throws Exception {
8985
comparePdf(outPath, dest, cmp);
9086

9187
if (errorMessage != null)
92-
Assert.fail(errorMessage);
88+
Assertions.fail(errorMessage);
9389
System.out.println("Test complete.");
9490
}
9591

@@ -262,7 +258,7 @@ private static File getFileByLocation(String targetSubDirectory, String filePath
262258
return null;
263259
}
264260

265-
private static class RunnerParams {
261+
protected static class RunnerParams {
266262
String className;
267263
String ignoreMessage;
268264

0 commit comments

Comments
 (0)