Skip to content

Migrate tests to JUnit5 #16

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
froque merged 1 commit into from
Jan 9, 2026
Merged

Migrate tests to JUnit5 #16

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
36 changes: 17 additions & 19 deletions src/test/java/org/jenkinsci/plugins/vb6/VB6BuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,21 @@
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
import org.jvnet.hudson.test.recipes.LocalData;

import java.nio.file.Files;
import java.nio.file.Paths;

@WithJenkins
public class VB6BuilderTest {

@Rule
public JenkinsRule j = new JenkinsRule();

@Test
public void testUnix() throws Exception {
Assume.assumeFalse(Functions.isWindows());
void testUnix(JenkinsRule j) throws Exception {
Assumptions.assumeFalse(Functions.isWindows());

FreeStyleProject project1 = j.createFreeStyleProject("project1");
project1.getBuildersList().add(new VB6Builder("test.vbp"));
Expand All @@ -38,8 +36,8 @@ public void testUnix() throws Exception {
}

@Test
public void testWindowsWithoutBuildToolPathDefined() throws Exception {
Assume.assumeTrue(Functions.isWindows());
void testWindowsWithoutBuildToolPathDefined(JenkinsRule j) throws Exception {
Assumptions.assumeTrue(Functions.isWindows());

FreeStyleProject project1 = j.createFreeStyleProject("project1");
project1.getBuildersList().add(new VB6Builder("Project1.vbp"));
Expand All @@ -52,9 +50,9 @@ public void testWindowsWithoutBuildToolPathDefined() throws Exception {

@LocalData
@Test
public void testWindowsSuccess() throws Exception {
Assume.assumeTrue(Functions.isWindows());
Assume.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));
void testWindowsSuccess(JenkinsRule j) throws Exception {
Assumptions.assumeTrue(Functions.isWindows());
Assumptions.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));

VB6Builder.DescriptorImpl vb6 = (VB6Builder.DescriptorImpl) j.jenkins.getBuilder("VB6Builder");
vb6.setBuilderPath("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE");
Expand All @@ -71,9 +69,9 @@ public void testWindowsSuccess() throws Exception {

@LocalData
@Test
public void testWindowsFails() throws Exception {
Assume.assumeTrue(Functions.isWindows());
Assume.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));
void testWindowsFails(JenkinsRule j) throws Exception {
Assumptions.assumeTrue(Functions.isWindows());
Assumptions.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));

VB6Builder.DescriptorImpl vb6 = (VB6Builder.DescriptorImpl) j.jenkins.getBuilder("VB6Builder");
vb6.setBuilderPath("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE");
Expand All @@ -93,9 +91,9 @@ public void testWindowsFails() throws Exception {

@LocalData
@Test
public void testWindowsSuccessPipeline() throws Exception {
Assume.assumeTrue(Functions.isWindows());
Assume.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));
void testWindowsSuccessPipeline(JenkinsRule j) throws Exception {
Assumptions.assumeTrue(Functions.isWindows());
Assumptions.assumeTrue(Files.exists(Paths.get("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE")));

VB6Builder.DescriptorImpl vb6 = (VB6Builder.DescriptorImpl) j.jenkins.getBuilder("VB6Builder");
vb6.setBuilderPath("C:\\Program Files (x86)\\Microsoft Visual Studio\\VB98\\VB6.EXE");
Expand Down
Loading