Skip to content

Commit 2a5b2df

Browse files
Innovarzwenggibson9583
Innovarzweng
authored and
gibson9583
committed
update unit tests/jacoco to java 17
Signed-off-by: Chris Gibson <[email protected]>
1 parent 48f6cbe commit 2a5b2df

19 files changed

+257
-188
lines changed

‎client/ant-build.xml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,23 @@
332332
<classpath refid="testclasspath" />
333333
</javac>
334334
</target>
335-
336-
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
337-
<classpath path="${server}/lib/ant/jacocoant.jar"/>
338-
</taskdef>
339-
335+
336+
<path id="jacoco.classpath">
337+
<fileset dir="/Users/wengmark/mirthdev/mirth450/connect/server/lib/ant">
338+
<include name="org.jacoco.ant-0.8.8.jar"/>
339+
<include name="org.jacoco.core-0.8.8.jar"/>
340+
<include name="org.jacoco.report-0.8.8.jar"/>
341+
<include name="org.jacoco.agent-0.8.8.jar"/>
342+
<include name="asm-9.2.jar"/>
343+
<include name="asm-tree-9.2.jar"/>
344+
<include name="asm-commons-9.2.jar"/>
345+
</fileset>
346+
</path>
347+
348+
<taskdef uri="antlib:org.jacoco.ant"
349+
resource="org/jacoco/ant/antlib.xml"
350+
classpathref="jacoco.classpath"/>
351+
340352
<target name="test-run" depends="test-compile">
341353
<property name="junit-reports" value="junit-reports" />
342354
<property name="code-coverage-reports" value="code-coverage-reports" />
@@ -347,6 +359,13 @@
347359
<junit haltonfailure="false" fork="true" forkmode="once">
348360
<jvmarg value="-Xms128m" />
349361
<jvmarg value="-Xmx2048m" />
362+
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
363+
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
364+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
365+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
366+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
367+
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
368+
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
350369
<classpath>
351370
<path refid="testclasspath" />
352371
<dirset dir="${test_classes}"/>

‎command/build.xml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,23 @@
7171
<classpath refid="testclasspath" />
7272
</javac>
7373
</target>
74-
75-
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
76-
<classpath path="${server}/lib/ant/jacocoant.jar"/>
77-
</taskdef>
78-
74+
75+
<path id="jacoco.classpath">
76+
<fileset dir="/Users/wengmark/mirthdev/mirth450/connect/server/lib/ant">
77+
<include name="org.jacoco.ant-0.8.8.jar"/>
78+
<include name="org.jacoco.core-0.8.8.jar"/>
79+
<include name="org.jacoco.report-0.8.8.jar"/>
80+
<include name="org.jacoco.agent-0.8.8.jar"/>
81+
<include name="asm-9.2.jar"/>
82+
<include name="asm-tree-9.2.jar"/>
83+
<include name="asm-commons-9.2.jar"/>
84+
</fileset>
85+
</path>
86+
87+
<taskdef uri="antlib:org.jacoco.ant"
88+
resource="org/jacoco/ant/antlib.xml"
89+
classpathref="jacoco.classpath"/>
90+
7991
<target name="test-run" depends="test-compile">
8092
<property name="junit-reports" value="junit-reports" />
8193
<property name="code-coverage-reports" value="code-coverage-reports" />
@@ -86,6 +98,13 @@
8698
<junit haltonfailure="false" fork="true" forkmode="once">
8799
<jvmarg value="-Xms128m" />
88100
<jvmarg value="-Xmx2048m" />
101+
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
102+
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
103+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
104+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
105+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
106+
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
107+
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
89108
<classpath>
90109
<path refid="testclasspath" />
91110
<dirset dir="${test_classes}"/>

‎donkey/build.xml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,22 @@
7070
<classpath refid="testclasspath" />
7171
</javac>
7272
</target>
73-
74-
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
75-
<classpath path="${server}/lib/ant/jacocoant.jar"/>
76-
</taskdef>
73+
74+
<path id="jacoco.classpath">
75+
<fileset dir="/Users/wengmark/mirthdev/mirth450/connect/server/lib/ant">
76+
<include name="org.jacoco.ant-0.8.8.jar"/>
77+
<include name="org.jacoco.core-0.8.8.jar"/>
78+
<include name="org.jacoco.report-0.8.8.jar"/>
79+
<include name="org.jacoco.agent-0.8.8.jar"/>
80+
<include name="asm-9.2.jar"/>
81+
<include name="asm-tree-9.2.jar"/>
82+
<include name="asm-commons-9.2.jar"/>
83+
</fileset>
84+
</path>
85+
86+
<taskdef uri="antlib:org.jacoco.ant"
87+
resource="org/jacoco/ant/antlib.xml"
88+
classpathref="jacoco.classpath"/>
7789

7890
<target name="test-run" depends="test-compile">
7991
<property name="junit-reports" value="junit-reports" />
@@ -85,6 +97,13 @@
8597
<junit haltonfailure="false" fork="true" forkmode="once">
8698
<jvmarg value="-Xms128m" />
8799
<jvmarg value="-Xmx2048m" />
100+
<jvmarg value="--add-opens=java.base/sun.misc=ALL-UNNAMED"/>
101+
<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
102+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
103+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
104+
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
105+
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
106+
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
88107
<classpath>
89108
<path refid="testclasspath" />
90109
<dirset dir="${test_classes}"/>

0 commit comments

Comments
 (0)