Throw an error if the verifier did not complete in time

trickl · Oct 3, 2020 · 7972930 · 7972930
1 parent 32c3278
commit 7972930
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.trickl</groupId>
   <artifactId>flux-mock-websocket</artifactId>
-  <version>0.0.3-SNAPSHOT</version>
+  <version>0.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -97,8 +97,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.3</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>8</source>
+          <target>8</target>
           <debug>true</debug>
         </configuration>
       </plugin>
@@ -130,6 +130,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.10.3</version>
+        <configuration>
+          <source>8</source>
+        </configuration>
         <executions>
             <execution>
                 <id>attach-javadocs</id>
@@ -208,7 +211,7 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.1</version>
+            <version>0.8.5</version>
             <executions>
               <execution>
                 <id>prepare-agent</id>

diff --git a/src/main/java/com/trickl/flux/websocket/VerifierComplete.java b/src/main/java/com/trickl/flux/websocket/VerifierComplete.java
@@ -1,5 +1,6 @@
 package com.trickl.flux.websocket;
 
+import com.trickl.exceptions.StepVerifierException;
 import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -17,17 +18,21 @@ public class VerifierComplete {
    * @param duration how long to wait
    */
   public void waitComplete(Duration duration) {
+    boolean didComplete = false;
     try {
-      completeSignal.await(duration.toMillis(), TimeUnit.MILLISECONDS);
+      didComplete = completeSignal.await(duration.toMillis(), TimeUnit.MILLISECONDS);
     } catch (InterruptedException ex) {
       log.warning("Verifier interrupted");
     }
+    if (!didComplete) {
+      throw new StepVerifierException("Verifier did not complete within " + duration.toString());
+    }
   }
 
   /**
    * Block until complete.
    */
-  public void waitComplete() {
+  public void waitComplete() {    
     try {
       completeSignal.await();
     } catch (InterruptedException ex) {