392237 cleaned up client test exceptions

jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientContinueTest.java

@@ -35,10 +35,13 @@ import org.eclipse.jetty.client.util.BytesContentProvider;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpHeaderValue;
 import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.toolchain.test.annotation.Slow;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.Assert;
 import org.junit.Test;
@@ -417,24 +420,34 @@ public class HttpClientContinueTest extends AbstractHttpClientServerTest
             }
         });
 
-        byte[] content = new byte[1024];
+        try
-        final CountDownLatch latch = new CountDownLatch(1);
+        {
-        client.newRequest("localhost", connector.getLocalPort())
+            Log.getLogger(HttpChannel.class).info("Expecting Close warning...");
-                .scheme(scheme)
+            ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true);
-                .header(HttpHeader.EXPECT.asString(), HttpHeaderValue.CONTINUE.asString())
-                .content(new BytesContentProvider(content))
-                .send(new BufferingResponseListener()
-                {
-                    @Override
-                    public void onComplete(Result result)
-                    {
-                        Assert.assertTrue(result.isFailed());
-                        Assert.assertNotNull(result.getRequestFailure());
-                        Assert.assertNotNull(result.getResponseFailure());
-                        latch.countDown();
-                    }
-                });
 
-        Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
+            byte[] content = new byte[1024];
+            final CountDownLatch latch = new CountDownLatch(1);
+            client.newRequest("localhost", connector.getLocalPort())
+            .scheme(scheme)
+            .header(HttpHeader.EXPECT.asString(), HttpHeaderValue.CONTINUE.asString())
+            .content(new BytesContentProvider(content))
+            .send(new BufferingResponseListener()
+            {
+                @Override
+                public void onComplete(Result result)
+                {
+                    Assert.assertTrue(result.isFailed());
+                    Assert.assertNotNull(result.getRequestFailure());
+                    Assert.assertNotNull(result.getResponseFailure());
+                    latch.countDown();
+                }
+            });
+
+            Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
+        finally
+        {
+            ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false);
+        }
     }
 }

jetty-client/src/test/java/org/eclipse/jetty/client/HttpConnectionLifecycleTest.java

@@ -36,6 +36,7 @@ import org.eclipse.jetty.client.util.ByteBufferContentProvider;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.toolchain.test.annotation.Slow;
+import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.Assert;
@@ -403,6 +404,8 @@ public class HttpConnectionLifecycleTest extends AbstractHttpClientServerTest
             final BlockingQueue<Connection> activeConnections = destination.getActiveConnections();
             Assert.assertEquals(0, activeConnections.size());
 
+            Log.getLogger(HttpConnection.class).info("Expecting java.lang.IllegalStateException: HttpParser{s=CLOSED,...");
+            
             final CountDownLatch latch = new CountDownLatch(1);
             client.newRequest(host, port)
                     .scheme(scheme)

jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java

@@ -32,8 +32,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.util.ByteBufferContentProvider;
+import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.Assert;
 import org.junit.Test;
@@ -169,6 +172,8 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest
         //    reads -1 with a pending exchange and fails the response with an EOFException
         try
         {
+            Log.getLogger(HttpChannel.class).info("Excpecting java.nio.channels.ClosedChannelException...");
+            ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true);
             ContentResponse response = client.newRequest("localhost", connector.getLocalPort())
                     .scheme(scheme)
                     .listener(new Request.Listener.Empty()
@@ -210,5 +215,9 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest
                 throw x;
             }
         }
+        finally
+        {
+            ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false);
+        }
     }
 }