Skip to content

Ban JUnit 4 imports #178

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

Merged
MarkEWaite merged 1 commit into from
Dec 19, 2025
+9 −12
Merged

Ban JUnit 4 imports #178

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/hudson/tasks/AntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TemporaryFolder;

import org.jvnet.hudson.test.ExtractResourceSCM;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
Expand Down Expand Up @@ -244,7 +244,7 @@ void testParameterExpansion() throws Exception {
}

private AntInstallation configureDefaultAnt() throws Exception {
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
return ToolInstallations.configureDefaultAnt(temporaryFolder);
}
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/hudson/tasks/AntWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.*;
import org.jvnet.hudson.test.junit.jupiter.BuildWatcherExtension;
import org.jvnet.hudson.test.junit.jupiter.JenkinsSessionExtension;
Expand All @@ -59,7 +58,7 @@
@Test
void configRoundTrip() throws Throwable {
r.then(j -> {
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
Ant.AntInstallation installation = ToolInstallations.configureDefaultAnt(temporaryFolder);
FreeStyleProject p = j.createFreeStyleProject(); // no configRoundTrip(BuildWrapper) it seems
Expand All @@ -79,9 +78,9 @@
@Test
void smokes() throws Throwable {
r.then(j -> {
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
ToolInstallations.configureDefaultAnt(temporaryFolder); // TODO could instead use DockerRule<JavaContainer> to run against a specified JDK location

Check warning on line 83 in src/test/java/hudson/tasks/AntWrapperTest.java

View check run for this annotation

ci.jenkins.io / Open Tasks Scanner

TODO 

NORMAL:
to run against a specified JDK location
could instead use DockerRule
DumbSlave s = j.createOnlineSlave();
logging.recordPackage(ConsoleNote.class, Level.FINE);
WorkflowJob p = j.createProject(WorkflowJob.class, "p");
Expand All @@ -101,7 +100,7 @@
@Test
void durability() throws Throwable {
r.then(j -> {
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
ToolInstallations.configureDefaultAnt(temporaryFolder);
WorkflowJob p = j.createProject(WorkflowJob.class, "p");
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.ExtractResourceSCM;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.ToolInstallations;
Expand Down Expand Up @@ -47,7 +46,7 @@ void setUp(JenkinsRule rule) throws Exception {
j.jenkins.getJDKs().add(varJDK);

// Ant with a variable in its path
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder);
AntInstallation antInstallation =
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.JenkinsRule.WebClient;
import org.jvnet.hudson.test.SingleFileSCM;
Expand Down Expand Up @@ -48,7 +47,7 @@ void tearDown() {
@Test
void test1() throws Exception {
FreeStyleProject p = r.createFreeStyleProject();
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
Ant.AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder);
p.getBuildersList().add(new Ant("foo",ant.getName(),null,null,null));
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/hudson/tools/ToolLocationNodePropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.rules.TemporaryFolder;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.SingleFileSCM;
import org.jvnet.hudson.test.ToolInstallations;
Expand Down Expand Up @@ -83,7 +82,7 @@ private void configureDumpEnvBuilder() {

@Test
void ant() throws Exception {
TemporaryFolder temporaryFolder = new TemporaryFolder(tmp);
org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp);
temporaryFolder.create();
AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder);
String antPath = ant.getHome();
Expand Down
Loading