Merge pull request #253 from jglick/ShellStepTest.label

Improve `ShellStepTest.label` with Hamcrest
jenkinsci · Jul 19, 2022 · 9af20dd · 9af20dd
2 parents c93d7d4 + c6bb73f
commit 9af20dd
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/ShellStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/ShellStepTest.java
@@ -361,16 +361,9 @@ private static class Decorator extends LauncherDecorator implements Serializable
 
         WorkflowRun b = j.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get());
 
-        boolean found = false;
         FlowGraphTable t = new FlowGraphTable(b.getExecution());
         t.build();
-        for (Row r : t.getRows()) {
-            if (r.getDisplayName().contains("Step with label")) {
-                found = true;
-            }
-        }
-
-        assertTrue(found);
+        assertThat(t.getRows().stream().map(Row::getDisplayName).toArray(String[]::new), hasItemInArray(containsString("Step with label")));
     }
 
     @Test public void labelShortened() throws Exception {
@@ -382,16 +375,9 @@ private static class Decorator extends LauncherDecorator implements Serializable
 
         WorkflowRun b = j.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0).get());
 
-        boolean found = false;
         FlowGraphTable t = new FlowGraphTable(b.getExecution());
         t.build();
-        for (Row r : t.getRows()) {
-            if (r.getDisplayName().contains(singleLabel)) {
-                found = true;
-            }
-        }
-
-        assertTrue(found);
+        assertThat(t.getRows().stream().map(Row::getDisplayName).toArray(String[]::new), hasItemInArray(containsString(singleLabel)));
     }
 
     @Issue("JENKINS-38381")