Skip to content

[JENKINS-48466] Provide JUnit 5 support for JenkinsRule #6657

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
basil merged 11 commits into from
Jul 22, 2022
Merged

[JENKINS-48466] Provide JUnit 5 support for JenkinsRule #6657

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
59a0061
[JENKINS-48466] Provide JUnit 5 support for `JenkinsRule`
basil Jun 16, 2022
c9a4c62
Merge remote-tracking branch 'origin/master' into jupiter
basil Jun 26, 2022
b8696b7
Merge remote-tracking branch 'origin/master' into jupiter
basil Jul 5, 2022
193ec7c
Merge branch 'master' into jupiter
basil Jul 7, 2022
9f5be0b
Merge branch 'master' into jupiter
basil Jul 12, 2022
aeb27b3
Merge branch 'master' into jupiter
basil Jul 13, 2022
88a6665
Merge remote-tracking branch 'origin/master' into jupiter
basil Jul 15, 2022
ead0048
Merge remote-tracking branch 'origin/master' into jupiter
basil Jul 18, 2022
6db10fd
https://github.com/jenkinsci/jenkins-test-harness/pull/438 was released
basil Jul 18, 2022
b000587
Merge remote-tracking branch 'origin/master' into jupiter
basil Jul 20, 2022
7c05422
Update test harness
basil Jul 20, 2022
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
14 changes: 13 additions & 1 deletion test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ THE SOFTWARE.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>1812.v6d4e97d91fd8</version>
<version>1813.v14f5db_a_f2b_d3</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -189,6 +189,18 @@ THE SOFTWARE.
<version>318.va_f3ccb_729b_71</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
Comment on lines +192 to +203
Copy link
Member Author

@basil basil Jul 18, 2022 •
edited by jglick
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with

jenkins/core/pom.xml

Lines 518 to 529 in 38d4e86

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
Expand Down
12 changes: 5 additions & 7 deletions test/src/test/java/hudson/console/ExceptionAnnotationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@
import hudson.model.BuildListener;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.TestBuilder;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;

/**
* @author Kohsuke Kawaguchi
*/
public class ExceptionAnnotationTest {

@Rule
public JenkinsRule j = new JenkinsRule();
class ExceptionAnnotationTest {

@WithJenkins
@Test
public void test() throws Exception {
void test(JenkinsRule j) throws Exception {
FreeStyleProject p = j.createFreeStyleProject();
p.getBuildersList().add(new TestBuilder() {
@Override
Expand Down