Merge pull request #3916 from senivam/jmockit_upgrade

Version of JMockit updated to 1.41

Author: senivam

.travis.yml

@@ -7,6 +7,7 @@ services:
 
 jdk:
   - oraclejdk8
+  - openjdk8
 
 cache:
   directories:

core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/PackageNamesScannerTest.java

@@ -16,7 +16,18 @@
 
 package org.glassfish.jersey.server.internal.scanning;
 
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Tested;
+import mockit.Verifications;
+import mockit.integration.junit4.JMockit;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
@@ -26,21 +37,16 @@
 import java.util.Vector;
 import java.util.jar.JarInputStream;
 
-import org.junit.Before;
-import org.junit.Test;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import mockit.Expectations;
-import mockit.Mocked;
-import mockit.Verifications;
-
 /**
  * Unit tests for {@link PackageNamesScanner}.
  *
  * @author Eric Navarro
  * @author Michal Gajdos
  */
+@RunWith(JMockit.class)
 public class PackageNamesScannerTest {
 
     private static final String[] packages = {"javax.ws.rs"};
@@ -89,14 +95,23 @@ public void testInvalidScheme() {
         new PackageNamesScanner(createTestClassLoader("bad", createTestURLStreamHandler("bad"), jaxRsApiPath), packages, false);
     }
 
+
+    @Tested
+    PackageNamesScanner scanner1 = new PackageNamesScanner(new String[]{"javax.ws.rs"}, false);
+    @Tested
+    PackageNamesScanner scanner2 = new PackageNamesScanner(new String[]{"javax.ws.rs.core"}, false);
+    @Tested
+    PackageNamesScanner scanner3 = new PackageNamesScanner(new String[]{"javax.ws.rs.client"}, false);
+
     /**
      * Reproducer for OWLS-19790: When scanner is reset the underlying JAR input streams should be closed.
      */
     @Test
-    public void testInputStreamClosedAfterReset(@Mocked final JarInputStream stream) throws Exception {
-        final PackageNamesScanner scanner1 = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
-        final PackageNamesScanner scanner2 = new PackageNamesScanner(new String[] {"javax.ws.rs.core"}, false);
-        final PackageNamesScanner scanner3 = new PackageNamesScanner(new String[] {"javax.ws.rs.client"}, false);
+    public void testInputStreamClosedAfterReset() throws Exception {
+        JarInputStream stream = new JarInputStream(
+                new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+        new Expectations(InputStream.class){};
 
         scanner1.reset();
 
@@ -115,10 +130,12 @@ public void testInputStreamClosedAfterReset(@Mocked final JarInputStream stream)
      * Reproducer for OWLS-19790: When scanner is closed the underlying JAR input streams should be closed as well.
      */
     @Test
-    public void testInputStreamClosedAfterClose(@Mocked final JarInputStream stream) throws Exception {
-        final PackageNamesScanner scanner1 = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
-        final PackageNamesScanner scanner2 = new PackageNamesScanner(new String[] {"javax.ws.rs.core"}, false);
-        final PackageNamesScanner scanner3 = new PackageNamesScanner(new String[] {"javax.ws.rs.client"}, false);
+    public void testInputStreamClosedAfterClose()  throws Exception {
+
+        JarInputStream stream = new JarInputStream(
+                new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+        new Expectations(JarInputStream.class){};
 
         scanner1.close();
 
@@ -136,16 +153,19 @@ public void testInputStreamClosedAfterClose(@Mocked final JarInputStream stream)
     /**
      * Reproducer for OWLS-19790: When we iterate through the all entries provided by a scanner JAR input stream should be closed.
      */
+    @Tested
+    PackageNamesScanner scanner = new PackageNamesScanner(new String[]{"javax.ws.rs"}, false);
     @Test
-    public void testInputStreamClosedAfterIteration(@Mocked final JarInputStream stream) throws Exception {
-        new Expectations() {{
+    public void testInputStreamClosedAfterIteration(@Injectable("false") boolean recursive) throws Exception {
+        JarInputStream stream = new JarInputStream(
+                new ByteArrayInputStream("test".getBytes(), 0, 4));
+
+        new Expectations(JarInputStream.class) {{
             stream.getNextJarEntry();
             result = null;
             stream.close();
         }};
 
-        final PackageNamesScanner scanner = new PackageNamesScanner(new String[] {"javax.ws.rs"}, false);
-
         while (scanner.hasNext()) {
             scanner.next();
         }

pom.xml

@@ -1961,7 +1961,7 @@
         <jetty.version>9.4.7.v20170914</jetty.version>
         <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
         <jmh.version>1.10.2</jmh.version>
-        <jmockit.version>1.18</jmockit.version>
+        <jmockit.version>1.41</jmockit.version>
         <jsonp.ri.version>1.1</jsonp.ri.version>
         <jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version>
         <jsp.version>2.0</jsp.version>

tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JaxbTest.java

@@ -20,7 +20,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.persistence.internal.helper.JavaVersion;
 import org.glassfish.grizzly.utils.ArrayUtils;
 import org.glassfish.jersey.internal.util.PropertiesHelper;
 import org.glassfish.jersey.tests.e2e.json.entity.AnotherArrayTestBean;
@@ -98,6 +97,16 @@ public JaxbTest(final JsonTestSetup jsonTestSetup) throws Exception {
         super(jsonTestSetup);
     }
 
+    /**
+     * checks provided string to be a number
+     *
+     * @param s string
+     * @return true if string is a number false otherwise
+     */
+    private static boolean isNumeric(String s) {
+        return java.util.regex.Pattern.matches("\\d+", s);
+    }
+
     /**
      * check if the current JVM is supported by this test.
      *
@@ -108,7 +117,8 @@ private static boolean isJavaVersionSupported() {
         if (javaVersion != null) {
             int pos =  javaVersion.lastIndexOf("_");
             if (pos > -1) {
-                final Integer minorVersion = Integer.valueOf(javaVersion.substring(pos + 1));
+                final String rawMinorVersion = javaVersion.substring(pos + 1);
+                final Integer minorVersion = (isNumeric(rawMinorVersion)) ? Integer.valueOf(rawMinorVersion) : 0;
                 return minorVersion < 160 || minorVersion > 172; //only those between 161 and 172 minor
                                                                  // releases are not supported
             }