Skip to content

Migrate tests to JUnit5 #167

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
merged 1 commit into from
May 14, 2025
Merged

Migrate tests to JUnit5 #167

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
47 changes: 29 additions & 18 deletions src/test/java/org/jenkinsci/plugins/workflow/pipelinegraphanalysis/StageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@
import org.jenkinsci.plugins.workflow.graphanalysis.StandardChunkVisitor;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import org.jvnet.hudson.test.JenkinsRule;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;

import edu.umd.cs.findbugs.annotations.NonNull;
import org.jvnet.hudson.test.junit.jupiter.WithJenkins;

import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
Expand All @@ -22,10 +28,15 @@
* Tests the stage collection
* @author Sam Van Oort
*/
public class StageTest {
@WithJenkins
class StageTest {

@Rule
public JenkinsRule jenkinsRule = new JenkinsRule();
private JenkinsRule jenkinsRule;

@BeforeEach
void setUp(JenkinsRule rule) {
jenkinsRule = rule;
}

public static class CollectingChunkVisitor extends StandardChunkVisitor {
final Deque<MemoryFlowChunk> allChunks = new ArrayDeque<>();
Expand All @@ -44,29 +55,29 @@ protected void handleChunkDone(@NonNull MemoryFlowChunk chunk) {
/** Assert that chunk flownode IDs match expected, use 0 or -1 ID for null flownode */
private static void assertChunkBoundary(FlowChunkWithContext chunk, int beforeId, int firstId, int lastId, int afterId) {
// First check the chunk boundaries, then the before/after
Assert.assertNotNull(chunk.getFirstNode());
Assert.assertEquals(firstId, Integer.parseInt(chunk.getFirstNode().getId()));
Assert.assertNotNull(chunk.getLastNode());
Assert.assertEquals(lastId, Integer.parseInt(chunk.getLastNode().getId()));
assertNotNull(chunk.getFirstNode());
assertEquals(firstId, Integer.parseInt(chunk.getFirstNode().getId()));
assertNotNull(chunk.getLastNode());
assertEquals(lastId, Integer.parseInt(chunk.getLastNode().getId()));

if (beforeId > 0) {
Assert.assertNotNull(chunk.getNodeBefore());
Assert.assertEquals(beforeId, Integer.parseInt(chunk.getNodeBefore().getId()));
assertNotNull(chunk.getNodeBefore());
assertEquals(beforeId, Integer.parseInt(chunk.getNodeBefore().getId()));
} else {
Assert.assertNull(chunk.getNodeBefore());
assertNull(chunk.getNodeBefore());
}

if (afterId > 0) {
Assert.assertNotNull(chunk.getNodeAfter());
Assert.assertEquals(afterId, Integer.parseInt(chunk.getNodeAfter().getId()));
assertNotNull(chunk.getNodeAfter());
assertEquals(afterId, Integer.parseInt(chunk.getNodeAfter().getId()));
} else {
Assert.assertNull(chunk.getNodeAfter());
assertNull(chunk.getNodeAfter());
}

}

@Test
public void testBlockStage() throws Exception {
void testBlockStage() throws Exception {
WorkflowJob job = jenkinsRule.jenkins.createProject(WorkflowJob.class, "Blocky job");

job.setDefinition(new CpsFlowDefinition("""
Expand Down Expand Up @@ -139,7 +150,7 @@ public void testBlockStage() throws Exception {
scan.visitSimpleChunks(visitor, new StageChunkFinder());

List<MemoryFlowChunk> stages = visitor.getChunks();
Assert.assertEquals(3, stages.size());
assertEquals(3, stages.size());
assertChunkBoundary(stages.get(0), 5, 6, 8, 9);
assertChunkBoundary(stages.get(1), 10, 11, 13, 14);
assertChunkBoundary(stages.get(2), 15, 16, 20, 21);
Expand Down
Loading