Fixed incorrect wait methods in ShellTest utility.

forge · Aug 26, 2013 · 2020c1c · 2020c1c
1 parent 226a20d
commit 2020c1c
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/shell/test-harness/src/main/java/org/jboss/forge/addon/shell/test/impl/DefaultShellTest.java b/shell/test-harness/src/main/java/org/jboss/forge/addon/shell/test/impl/DefaultShellTest.java
@@ -126,7 +126,7 @@ public Result execute(String line, int quantity, TimeUnit unit)
          {
             if (System.currentTimeMillis() > (start + TimeUnit.MILLISECONDS.convert(quantity, unit)))
             {
-               throw new TimeoutException("Timeout expired waiting for command [" + line + "].");
+               throw throwTimeout("Timeout expired waiting for command [" + line + "].");
             }
 
             try
@@ -145,7 +145,7 @@ public Result execute(String line, int quantity, TimeUnit unit)
          throw new RuntimeException("Failed to execute command.", e);
       }
       return result;
-   };
+   }
 
    @Override
    public void waitForStdOutChanged(final String value, int quantity, TimeUnit unit) throws TimeoutException
@@ -220,13 +220,12 @@ private void waitForStream(Callable<?> task, ByteArrayOutputStream stream, int q
       }
 
       long start = System.currentTimeMillis();
-      while (System.currentTimeMillis() < (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
-               && stream.size() == size)
+      while (stream.size() == size)
       {
          if (System.currentTimeMillis() >= (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
                   && stream.size() == size)
          {
-            throw new TimeoutException("Timeout occurred while waiting for stream.");
+            throw throwTimeout("Timeout occurred while waiting for stream to be written.");
          }
 
          try
@@ -235,7 +234,7 @@ private void waitForStream(Callable<?> task, ByteArrayOutputStream stream, int q
          }
          catch (InterruptedException e)
          {
-            throw new RuntimeException("Interrupted while waiting for Shell to respond.", e);
+            throw new RuntimeException("Interrupted while waiting for stream to be written.", e);
          }
       }
    }
@@ -254,13 +253,12 @@ private void waitForStreamValue(Callable<?> task, ByteArrayOutputStream stream,
       }
 
       long start = System.currentTimeMillis();
-      while (System.currentTimeMillis() < (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
-               && !new String(stream.toByteArray()).contains(expected))
+      while (!new String(stream.toByteArray()).contains(expected))
       {
          if (System.currentTimeMillis() >= (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
                   && !new String(stream.toByteArray()).contains(expected))
          {
-            throw new TimeoutException("Timeout occurred while waiting for stream.");
+            throw throwTimeout("Timeout occurred while waiting for stream value [" + expected + "].");
          }
 
          try
@@ -269,7 +267,7 @@ private void waitForStreamValue(Callable<?> task, ByteArrayOutputStream stream,
          }
          catch (InterruptedException e)
          {
-            throw new RuntimeException("Interrupted while waiting for Shell to respond.", e);
+            throw new RuntimeException("Interrupted while waiting for stream value [" + expected + "].", e);
          }
       }
    }
@@ -288,12 +286,13 @@ public void waitForBufferChanged(Callable<?> task, int quantity, TimeUnit unit)
       }
 
       long start = System.currentTimeMillis();
-      while (System.currentTimeMillis() < (start + TimeUnit.MILLISECONDS.convert(quantity, unit)))
+      while (buffer.equals(getBuffer().getLine().length()))
       {
          if (System.currentTimeMillis() >= (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
-                  && buffer.equals(getBuffer().getLine().length()))
+                  && buffer.equals(getBuffer().getLine()))
          {
-            throw new TimeoutException("Timeout occurred while waiting for buffer.");
+            throw throwTimeout("Timeout occurred while waiting for buffer value to change from [" + buffer
+                     + "].");
          }
 
          try
@@ -302,7 +301,7 @@ public void waitForBufferChanged(Callable<?> task, int quantity, TimeUnit unit)
          }
          catch (InterruptedException e)
          {
-            throw new RuntimeException("Interrupted while waiting for Shell to respond.", e);
+            throw new RuntimeException("Interrupted while waiting for buffer value to change from [" + buffer + "].", e);
          }
       }
    }
@@ -321,13 +320,12 @@ public void waitForBufferValue(Callable<?> task, int quantity, TimeUnit unit, St
       }
 
       long start = System.currentTimeMillis();
-      while (System.currentTimeMillis() < (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
-               && !getBuffer().getLine().equals(expected))
+      while (!getBuffer().getLine().equals(expected))
       {
          if (System.currentTimeMillis() >= (start + TimeUnit.MILLISECONDS.convert(quantity, unit))
                   && !getBuffer().getLine().equals(expected))
          {
-            throw new TimeoutException("Timeout occurred while waiting for buffer.");
+            throw throwTimeout("Timeout occurred while waiting for buffer to equal value [" + expected + "].");
          }
 
          try
@@ -336,9 +334,11 @@ public void waitForBufferValue(Callable<?> task, int quantity, TimeUnit unit, St
          }
          catch (InterruptedException e)
          {
-            throw new RuntimeException("Interrupted while waiting for Shell to respond.", e);
+            throw new RuntimeException("Interrupted while waiting for buffer to equal value  [" + expected + "].", e);
          }
       }
+
+      System.out.println("returning");
    }
 
    @Override
@@ -464,6 +464,12 @@ public void sendCompletionSignal() throws IOException
       getStdIn().write(completeChar.getFirstValue());
    }
 
+   private TimeoutException throwTimeout(String message) throws TimeoutException
+   {
+      return new TimeoutException(message + "\n\nSTDOUT: " + provider.getStdOut().toString() + "\n\nSTDERR: "
+               + provider.getStdErr().toString());
+   };
+
    @Override
    public void clearScreen() throws IOException
    {