1 files changed, 18 insertions, 2 deletions

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
index 6bb182ce22..eec253367b 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
@@ -21,7 +21,11 @@ import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
+import org.eclipse.jetty.toolchain.test.OS;
+import org.eclipse.jetty.toolchain.test.Stress;
 import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Functional testing for HttpExchange.
@@ -31,8 +35,10 @@ import org.junit.Assume;
  */
 public class SslHttpExchangeTest extends HttpExchangeTest
 {
+    /* ------------------------------------------------------------ */
+    @Before
     @Override
-    protected void setUp() throws Exception
+    public void setUp() throws Exception
     {
         _scheme="https://";
         startServer();
@@ -46,6 +52,7 @@ public class SslHttpExchangeTest extends HttpExchangeTest
         _httpClient.start();
     }
 
+    /* ------------------------------------------------------------ */
     @Override
     protected void newServer()
     {
@@ -67,7 +74,9 @@ public class SslHttpExchangeTest extends HttpExchangeTest
         _connector=connector;
     }
     
-    private void IgnoreTestOnBuggyIBM() {
+    /* ------------------------------------------------------------ */
+    private void IgnoreTestOnBuggyIBM()
+    {
         // Use Junit 4.x to flag test as ignored if encountering IBM JVM
         // Will show up in various junit reports as an ignored test as well.
         Assume.assumeThat(System.getProperty("java.vendor").toLowerCase(),not(containsString("ibm")));
@@ -77,6 +86,7 @@ public class SslHttpExchangeTest extends HttpExchangeTest
     /**
      * @see org.eclipse.jetty.client.HttpExchangeTest#testGetWithContentExchange()
      */
+    @Test
     @Override
     public void testGetWithContentExchange() throws Exception
     {
@@ -89,9 +99,13 @@ public class SslHttpExchangeTest extends HttpExchangeTest
     /**
      * @see org.eclipse.jetty.client.HttpExchangeTest#testPerf()
      */
+    @Test
     @Override
     public void testPerf() throws Exception
     {
+        // TODO needs to be further investigated
+        Assume.assumeTrue(!OS.IS_OSX || Stress.isEnabled());
+        
         // TODO Resolve problems on IBM JVM https://bugs.eclipse.org/bugs/show_bug.cgi?id=304532
         IgnoreTestOnBuggyIBM();
         super.testPerf();
@@ -101,6 +115,7 @@ public class SslHttpExchangeTest extends HttpExchangeTest
     /**
      * @see org.eclipse.jetty.client.HttpExchangeTest#testPostWithContentExchange()
      */
+    @Test
     @Override
     public void testPostWithContentExchange() throws Exception
     {
@@ -113,6 +128,7 @@ public class SslHttpExchangeTest extends HttpExchangeTest
     /**
      * @see org.eclipse.jetty.client.HttpExchangeTest#testReserveConnections()
      */
+    @Test
     @Override
     public void testReserveConnections() throws Exception
     {