From ce53786e3ded980fa5ebbd51f20448d194af3fc0 Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 11 Apr 2019 15:42:36 -0400 Subject: [PATCH 1/2] Use correct variable for nodeAfter in MemoryFlowChunk constructor --- .../plugins/workflow/graphanalysis/MemoryFlowChunk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunk.java b/src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunk.java index 43bba815..60a4b128 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunk.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunk.java @@ -45,7 +45,7 @@ public MemoryFlowChunk(@CheckForNull FlowNode before, @Nonnull FlowNode firstNod this.setNodeBefore(before); this.setFirstNode(firstNode); this.setLastNode(lastNode); - this.setNodeAfter(lastNode); + this.setNodeAfter(nodeAfter); } public MemoryFlowChunk() { From 401891b554d9440aa6393561c3674c612a1f4c0b Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Thu, 11 Apr 2019 16:07:59 -0400 Subject: [PATCH 2/2] Add unit test for MemoryFlowChunk constructor --- .../graphanalysis/MemoryFlowChunkTest.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/test/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunkTest.java diff --git a/src/test/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunkTest.java b/src/test/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunkTest.java new file mode 100644 index 00000000..90a7a492 --- /dev/null +++ b/src/test/java/org/jenkinsci/plugins/workflow/graphanalysis/MemoryFlowChunkTest.java @@ -0,0 +1,58 @@ +/* + * The MIT License + * + * Copyright 2019 CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.jenkinsci.plugins.workflow.graphanalysis; + +import org.jenkinsci.plugins.workflow.graph.FlowNode; +import org.junit.Test; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; + +public class MemoryFlowChunkTest { + + @Test + public void constructor() { + MockFlowNode start = new MockFlowNode("1"); + MockFlowNode blockStart = new MockFlowNode("2", start); + MockFlowNode blockEnd = new MockFlowNode("3", blockStart); + MockFlowNode end = new MockFlowNode("4", blockEnd); + MemoryFlowChunk chunk = new MemoryFlowChunk(start, blockStart, blockEnd, end); + assertThat(chunk.getNodeBefore(), equalTo(start)); + assertThat(chunk.getFirstNode(), equalTo(blockStart)); + assertThat(chunk.getLastNode(), equalTo(blockEnd)); + assertThat(chunk.getNodeAfter(), equalTo(end)); + } + + private static class MockFlowNode extends FlowNode { + public MockFlowNode(String id, FlowNode... parents) { + super(null, id, parents); + } + + @Override + protected String getTypeDisplayName() { + return "Mock FlowNode"; + } + } +}