From 107aaf90001284a0790b6b14059bd8075d969dbc Mon Sep 17 00:00:00 2001
From: "Ing. Pavel Janousek" <pjanouse@redhat.com>
Date: Wed, 11 May 2016 15:01:06 +0200
Subject: [PATCH] Modified per Oleg's comment

---
 .../hudson/cli/DeleteBuildsCommandTest.java   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java b/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java
index 9177d5cb9e..59d338c2d6 100644
--- a/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java
+++ b/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java
@@ -174,11 +174,11 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccess() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(5));
 
         CLICommandInvoker.Result result = command
@@ -198,8 +198,8 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccessEvenABuildIsSpecifiedTwice() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(2));
 
         CLICommandInvoker.Result result = command
@@ -219,8 +219,8 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccessEvenLastBuildDoesNotExist() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(2));
 
         CLICommandInvoker.Result result = command
@@ -240,12 +240,12 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccessEvenMiddleBuildDoesNotExist() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         project.getBuildByNumber(2).delete();
         project.getBuildByNumber(5).delete();
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(4));
@@ -267,9 +267,9 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccessEvenFirstBuildDoesNotExist() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         project.getBuildByNumber(1).delete();
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(2));
 
@@ -290,11 +290,11 @@ public class DeleteBuildsCommandTest {
 
     @Test public void deleteBuildsManyShouldSuccessEvenTheFirstAndLastBuildDoesNotExist() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
-        project.scheduleBuild2(0).get();
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
+        j.buildAndAssertSuccess(project);
         project.getBuildByNumber(1).delete();
         project.getBuildByNumber(3).delete();
         project.getBuildByNumber(5).delete();
-- 
GitLab