Fixed intermittently failing tests based on JMockit which does not support parallel test execution.

(cherry picked from commit 97ea29e)

Change-Id: Ie87cd6702e6de07ff329717e054e893ad13be2c3

Author: stepanv

core-client/pom.xml

@@ -155,8 +155,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java

@@ -42,7 +42,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
 import java.net.URI;
 
 import javax.ws.rs.core.GenericType;
@@ -57,27 +56,39 @@
 
 import org.hamcrest.core.Is;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-import mockit.integration.junit4.JMockit;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.same;
 
 /**
  * {@code ClientRequest} unit tests.
  *
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
-@RunWith(JMockit.class)
+@RunWith(MockitoJUnitRunner.class)
 public class ClientRequestTest {
 
+    @Mock
+    private MessageBodyWorkers workers;
+    @Mock
+    private GenericType<?> entityType;
+
+    @Before
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     /**
      * Test of resolving properties in the client request.
      */
@@ -157,26 +168,27 @@ public void testResolveProperty() {
         assertEquals("value-request", request.resolveProperty("name", "value-default"));
     }
 
-    @Test
-    public void testSSLExceptionHandling(@Mocked MessageBodyWorkers workers, @Mocked GenericType<?> entityType)
-            throws Exception {
+    private ClientRequest mockThrowing(Exception exception) throws IOException {
         JerseyClient client = new JerseyClientBuilder().build();
         final ClientRequest request = new ClientRequest(
                 URI.create("http://example.org"),
                 client.getConfiguration(),
                 new MapPropertiesDelegate());
 
+        Mockito.doThrow(exception).when(workers)
+                .writeTo(any(), same(entityType.getRawType()), same(entityType.getType()),
+                        Mockito.<Annotation[]>any(), Mockito.<MediaType>any(),
+                        Mockito.<MultivaluedMap<String, Object>>any(), Mockito.<PropertiesDelegate>any(),
+                        Mockito.<OutputStream>any(), Mockito.<Iterable<WriterInterceptor>>any());
+        return request;
+    }
+
+    @Test
+    public void testSSLExceptionHandling()
+            throws Exception {
         final IOException ioException = new IOException("Test");
-        new MockUp<MessageBodyWorkers>(workers) {
-            @Mock
-            OutputStream writeTo(Object entity, Class<?> rawType, Type type, Annotation[] annotations,
-                                 MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
-                                 PropertiesDelegate propertiesDelegate, OutputStream entityStream,
-                                 Iterable<WriterInterceptor> writerInterceptors)
-                    throws java.io.IOException, javax.ws.rs.WebApplicationException {
-                throw ioException;
-            }
-        };
+
+        final ClientRequest request = mockThrowing(ioException);
 
         try {
             request.doWriteEntity(workers, entityType);
@@ -186,26 +198,14 @@ OutputStream writeTo(Object entity, Class<?> rawType, Type type, Annotation[] an
                     e, Is.is(ioException));
         }
     }
+
     @Test
-    public void testRuntimeExceptionBeingReThrown(@Mocked MessageBodyWorkers workers, @Mocked GenericType<?> entityType)
+    public void testRuntimeExceptionBeingReThrown()
             throws Exception {
-        JerseyClient client = new JerseyClientBuilder().build();
-        final ClientRequest request = new ClientRequest(
-                URI.create("http://example.org"),
-                client.getConfiguration(),
-                new MapPropertiesDelegate());
 
         final RuntimeException runtimeException = new RuntimeException("Test");
-        new MockUp<MessageBodyWorkers>(workers) {
-            @Mock
-            OutputStream writeTo(Object entity, Class<?> rawType, Type type, Annotation[] annotations,
-                                 MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
-                                 PropertiesDelegate propertiesDelegate, OutputStream entityStream,
-                                 Iterable<WriterInterceptor> writerInterceptors)
-                    throws java.io.IOException, javax.ws.rs.WebApplicationException {
-                throw runtimeException;
-            }
-        };
+
+        ClientRequest request = mockThrowing(runtimeException);
 
         try {
             request.doWriteEntity(workers, entityType);

pom.xml

@@ -1768,6 +1768,12 @@
                 <version>${jmockit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>xmlunit</groupId>
                 <artifactId>xmlunit</artifactId>
@@ -1894,5 +1900,6 @@
         <weld.version>2.2.14.Final</weld.version>
         <xerces.version>2.11.0</xerces.version>
         <xmlunit.version>1.6</xmlunit.version>
+        <mockito.version>1.10.19</mockito.version>
     </properties>
 </project>