[JENKINS-30088] Cleaner appearance of nodes with blocks.

· Use the function name, not step display name, on the overall start and end nodes. · Omit any text on the block start and end nodes.
jenkinsci · Apr 8, 2016 · 2ef59e1 · 2ef59e1
1 parent 654e8b4
commit 2ef59e1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepEndNode.java
@@ -42,9 +42,9 @@ protected String getTypeFunctionName() {
         StepDescriptor d = getDescriptor();
         boolean isBody = getStartNode().isBody();
         if (isBody) {
-            return "} //" + (d != null ? d.getFunctionName() : getStartNode().getStepName());
+            return "}";
         } else {
-            return getStartNode().getStepName() + " : End";
+            return "} // " + (d != null ? d.getFunctionName() : getStartNode().getStepName());
         }
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java
@@ -51,9 +51,9 @@ protected String getTypeDisplayName() {
     protected String getTypeFunctionName() {
         StepDescriptor d = getDescriptor();
         if (isBody()) {
-            return (d != null ? d.getFunctionName() : descriptorId) + " {";
+            return "{";
         } else {
-            return getStepName() + " : Start";
+            return (d != null ? d.getFunctionName() : descriptorId) + " {";
         }
     }
 

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java
@@ -49,6 +49,8 @@
 import org.jvnet.hudson.test.JenkinsRule;
 
 import javax.mail.Folder;
+import org.junit.ClassRule;
+import org.jvnet.hudson.test.BuildWatcher;
 
 /**
  * Test of {@link WorkflowJob} that doesn't involve Jenkins restarts.
@@ -57,6 +59,8 @@
  */
 public class WorkflowJobNonRestartingTest extends AbstractCpsFlowTest {
 
+    @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
+
     WorkflowJob p;
 
     @Before public void setUp() throws Exception {
@@ -132,7 +136,6 @@ public void testRetry() throws Exception {
 
         String log = JenkinsRule.getLog(b);
         jenkins.assertLogNotContains("\tat ", b);
-        System.err.println(log);
 
         int idx = 0;
         for (String msg : new String[] {
@@ -152,14 +155,14 @@ public void testRetry() throws Exception {
 
         idx = 0;
         for (String msg : new String[] {
-            "[Pipeline] Retry the body up to N times : Start",
-            "[Pipeline] retry {",
-            "[Pipeline] } //retry",
-            "[Pipeline] retry {",
-            "[Pipeline] } //retry",
             "[Pipeline] retry {",
-            "[Pipeline] } //retry",
-            "[Pipeline] Retry the body up to N times : End",
+            "[Pipeline] {",
+            "[Pipeline] }",
+            "[Pipeline] {",
+            "[Pipeline] }",
+            "[Pipeline] {",
+            "[Pipeline] }",
+            "[Pipeline] } // retry",
         }) {
             idx = log.indexOf(msg, idx + 1);
             assertTrue(msg + " not found", idx != -1);