Changeset 14318 in josm

Timestamp:

2018-10-13T01:57:20+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16047 - update to JMockit 1.43 (contains Java11 fix)

see ​https://github.com/jmockit/jmockit1/issues/534

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• test/lib/jmockit-1.41.jar (deleted)
• test/lib/jmockit-1.43.jar (added)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (1 diff)

trunk/.classpath

@@ -23 +23 @@
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="test/lib/jmockit-1.41.jar">
+        <classpathentry kind="lib" path="test/lib/jmockit-1.43.jar">
                 <attributes>
                         <attribute name="test" value="true"/>

trunk/build.xml

@@ -497 +497 @@
                 <junit printsummary="${junit.printsummary}" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.41.jar"/>
+                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.43.jar"/>
                     <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -59 +59 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import mockit.integration.internal.TestRunnerDecorator;
+import mockit.integration.TestRunnerDecorator;
 
 /**