From 8df29f87261bd5198903a28976ae0631660b862a Mon Sep 17 00:00:00 2001
From: Alexander Dejanovski <alex@thelastpickle.com>
Date: Wed, 21 Dec 2016 11:37:29 +0100
Subject: [PATCH] Fix the stuff SonarQube was complaining about (never use
 Thread.sleep in tests :) Remove tabs in pom.xml

---
 pom.xml                                       | 162 +++++++++---------
 .../spotify/reaper/acceptance/BasicSteps.java |  27 +--
 2 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/pom.xml b/pom.xml
index a49da3f31..3e75454dd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,12 @@
             <version>${cucumber.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>2.0.0</version>
+            <scope>test</scope>
+         </dependency>
     </dependencies>
 
     <profiles>
@@ -116,40 +122,40 @@
                         </configuration>
                     </plugin>
                     <plugin>
-				        <artifactId>maven-surefire-plugin</artifactId>
-				        <version>2.19</version>
-				        <configuration>
-				          <argLine>${surefireArgLine}</argLine>
-				          <failIfNoTests>false</failIfNoTests>
-				          <excludes>
-				            <exclude>**/IT*.java</exclude>
-				            <exclude>**/*IT.java</exclude>
-				          </excludes>
-				          <workingDirectory>${project.build.directory}</workingDirectory>
-				        </configuration>
-				    </plugin>				
-				    <plugin>
-				        <groupId>org.apache.maven.plugins</groupId>
-				        <artifactId>maven-failsafe-plugin</artifactId>
-				        <version>2.19</version>
-				        <executions>
-				          <execution>
-				            <id>integration-tests</id>
-				            <goals>
-				              <goal>integration-test</goal>
-				              <goal>verify</goal>
-				            </goals>
-				            <configuration>
-				              <skipTests>true</skipTests>
-				              <argLine>${failsafeArgLine}</argLine>
-				              <failIfNoTests>false</failIfNoTests>
-				              <includes>
-					            <include>**/ReaperIT.java</include>
-					          </includes>
-				            </configuration>
-				          </execution>
-				        </executions>
-        			</plugin>    
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.19</version>
+                        <configuration>
+                          <argLine>${surefireArgLine}</argLine>
+                          <failIfNoTests>false</failIfNoTests>
+                          <excludes>
+                            <exclude>**/IT*.java</exclude>
+                            <exclude>**/*IT.java</exclude>
+                          </excludes>
+                          <workingDirectory>${project.build.directory}</workingDirectory>
+                        </configuration>
+                    </plugin>                
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>2.19</version>
+                        <executions>
+                          <execution>
+                            <id>integration-tests</id>
+                            <goals>
+                              <goal>integration-test</goal>
+                              <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                              <skipTests>true</skipTests>
+                              <argLine>${failsafeArgLine}</argLine>
+                              <failIfNoTests>false</failIfNoTests>
+                              <includes>
+                                <include>**/ReaperIT.java</include>
+                              </includes>
+                            </configuration>
+                          </execution>
+                        </executions>
+                    </plugin>    
                     <plugin>
                         <!-- To know which version of your application you have deployed on 
                             a machine -->
@@ -207,13 +213,13 @@
             </build>
         </profile>
         <profile>
-        	<id>integration-tests</id>
-        	<activation>
-        		<activeByDefault>false</activeByDefault>
-        	</activation>
-        	<build>
-        		<plugins>
-        			<plugin>
+            <id>integration-tests</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>3.1</version>
@@ -223,43 +229,43 @@
                             <encoding>UTF-8</encoding>
                         </configuration>
                     </plugin>
-	        		<plugin>
-				        <artifactId>maven-surefire-plugin</artifactId>
-				        <version>2.19</version>
-				        <configuration>
-				          <skipTests>true</skipTests>
-				          <argLine>${surefireArgLine}</argLine>
-				          <failIfNoTests>false</failIfNoTests>
-				          <excludes>
-				            <exclude>**/IT*.java</exclude>
-				            <exclude>**/*IT.java</exclude>
-				          </excludes>
-				          <workingDirectory>${project.build.directory}</workingDirectory>
-				        </configuration>
-				    </plugin>	
-        			<plugin>
-				        <groupId>org.apache.maven.plugins</groupId>
-				        <artifactId>maven-failsafe-plugin</artifactId>
-				        <version>2.19</version>
-				        <executions>
-				          <execution>
-				            <id>integration-tests</id>
-				            <goals>
-				              <goal>integration-test</goal>
-				              <goal>verify</goal>
-				            </goals>
-				            <configuration>
-				              <argLine>${failsafeArgLine}</argLine>
-				              <failIfNoTests>false</failIfNoTests>
-				              <includes>
-					            <include>**/ReaperIT.java</include>
-					          </includes>
-				            </configuration>
-				          </execution>
-				        </executions>
-        			</plugin>
-        		</plugins>
-        	</build>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.19</version>
+                        <configuration>
+                          <skipTests>true</skipTests>
+                          <argLine>${surefireArgLine}</argLine>
+                          <failIfNoTests>false</failIfNoTests>
+                          <excludes>
+                            <exclude>**/IT*.java</exclude>
+                            <exclude>**/*IT.java</exclude>
+                          </excludes>
+                          <workingDirectory>${project.build.directory}</workingDirectory>
+                        </configuration>
+                    </plugin>    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>2.19</version>
+                        <executions>
+                          <execution>
+                            <id>integration-tests</id>
+                            <goals>
+                              <goal>integration-test</goal>
+                              <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                              <argLine>${failsafeArgLine}</argLine>
+                              <failIfNoTests>false</failIfNoTests>
+                              <includes>
+                                <include>**/ReaperIT.java</include>
+                              </includes>
+                            </configuration>
+                          </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
             <id>build-ui</id>
diff --git a/src/test/java/com/spotify/reaper/acceptance/BasicSteps.java b/src/test/java/com/spotify/reaper/acceptance/BasicSteps.java
index b19ba01b5..824142e0d 100644
--- a/src/test/java/com/spotify/reaper/acceptance/BasicSteps.java
+++ b/src/test/java/com/spotify/reaper/acceptance/BasicSteps.java
@@ -39,6 +39,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import static org.awaitility.Awaitility.*;
+import static org.awaitility.Duration.*;
+import static java.util.concurrent.TimeUnit.*;
+
 /**
  * Basic acceptance test (Cucumber) steps.
  */
@@ -481,32 +485,19 @@ public void the_last_added_repair_is_stopped_for()
    TestContext.LAST_MODIFIED_ID = run.getId();
  }
  
- @And("^we wait for (\\d+) seconds$")
- public void we_wait_for(int sleepTime)
-     throws Throwable {
-   LOG.info("Sleeping for " + sleepTime + "s...");
-   Thread.sleep(sleepTime * 1000);
- }
- 
  @And("^we wait for at least (\\d+) segments to be repaired$")
  public void we_wait_for_at_least_segments_to_be_repaired(int nbSegmentsToBeRepaired)
-     throws Throwable {
-   int repairedSegments = 0;
-   int i = 0;
-   
-   while(repairedSegments<nbSegmentsToBeRepaired && i<60){
-     Thread.sleep(10000);
+     throws Throwable {   
+   await().with().pollInterval(10, SECONDS).atMost(2, MINUTES).until(() -> 
+   {
      ClientResponse response =
          ReaperTestJettyRunner.callReaper("GET", "/repair_run/" + TestContext.LAST_MODIFIED_ID,
                                           EMPTY_PARAMS);
      assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
      String responseData = response.getEntity(String.class);
      RepairRunStatus run = SimpleReaperClient.parseRepairRunStatusJSON(responseData);
-     i++;
-     repairedSegments = run.getSegmentsRepaired();
-   }
-   
-   assertTrue(repairedSegments >= nbSegmentsToBeRepaired);
+     return nbSegmentsToBeRepaired == run.getSegmentsRepaired();
+   });   
  }
  
 }