Changeset 36140 in osm for applications/viewer

Timestamp:

2023-09-18T14:36:02+02:00 (16 months ago)

Author:

taylor.smock

Message:

Fix #19064: resolve all tools using Apache Ivy (JMapViewer)

JUnit was updated from v4 to v5 as well.

Location:

applications/viewer/jmapviewer

Files:

• build.xml (modified) (7 diffs)
• ivy.xml (added)
• ivysettings.xml (added)
• test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java (modified) (2 diffs)
• test/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSourceTest.java (modified) (12 diffs)
• tools/checkstyle/checkstyle-all.jar (deleted)
• tools/jacocoant.jar (deleted)
• tools/spotbugs (deleted)
• tools/testlib (deleted)

applications/viewer/jmapviewer/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="all" name="jmapviewer" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless">
+<project default="all" name="jmapviewer"
+         xmlns:jacoco="antlib:org.jacoco.ant"
+         xmlns:if="ant:if"
+         xmlns:ivy="antlib:org.apache.ivy.ant"
+>
 
     <property name="java.lang.version" value="8" />
@@ -27 +31 @@
     </condition>
     <path id="test.classpath">
-        <fileset dir="${tools.dir}/testlib">
-            <include name="**/*.jar"/>
-        </fileset>
         <pathelement location="bin"/>
     </path>
@@ -80 +81 @@
             </fileset>
         </copy>
+    </target>
+
+    <target name="checkdepsupdate" depends="resolve">
+        <ivy:checkdepsupdate/>
     </target>
 
@@ -132 +137 @@
     </target>
 
-    <target name="checkstyle">
-        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
-            classpath="tools/checkstyle/checkstyle-all.jar"/>
+    <target name="checkstyle" depends="resolve">
+        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
+            classpathref="checkstyle.classpath"/>
         <checkstyle config="tools/checkstyle/jmapviewer_checks.xml">
             <!-- Exclude the module-info since checkstyle currently cannot parse it -->
@@ -142 +147 @@
     </target>
 
-    <target name="spotbugs" depends="pack">
+    <target name="spotbugs" depends="pack,resolve">
         <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
-            classpath="tools/spotbugs/spotbugs-ant.jar"/>
-        <path id="spotbugs-classpath">
-            <fileset dir="tools/spotbugs/">
-                <include name="*.jar"/>
-            </fileset>
-        </path>
-        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+            classpathref="spotbugs.classpath"/>
+        <property name="spotbugs-classpath" refid="spotbugs.classpath"/>
         <spotbugs output="xml"
                 outputFile="spotbugs-jmapviewer.xml"
@@ -178 +178 @@
     </target>
 
-    <target name="test" depends="clean, build">
-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
+    <target name="resolve" description="Resolve Ivy dependencies">
+        <ivy:resolve/>
+        <ivy:cachepath pathid="checkstyle.classpath" conf="checkstyle"/>
+        <ivy:cachepath pathid="testlib.classpath" conf="test"/>
+        <ivy:cachepath pathid="jacoco.classpath" conf="jacocoant"/>
+        <ivy:cachepath pathid="spotbugs.classpath" conf="spotbugs"/>
+    </target>
+
+    <target name="test" depends="clean, build, resolve">
+        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpathref="jacoco.classpath"/>
         <javac srcdir="test" destdir="bintest"
             target="${java.lang.version}" source="${java.lang.version}" debug="on"
@@ -186 +194 @@
             <compilerarg value="-Xlint:-serial"/>
             <classpath>
-                <path refid="test.classpath"/>
+                <path refid="testlib.classpath"/>
+                <path refid="test.classpath"/>
             </classpath>
         </javac>
-        <jacoco:coverage enabled="@{coverage}" includes="${jacoco.includes}"
-            inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
-            <junit printsummary="yes" fork="true" forkmode="once">
-                <jvmarg value="-Dfile.encoding=UTF-8"/>
-                <classpath>
-                    <path refid="test.classpath"/>
-                    <pathelement location="bintest"/>
-                </classpath>
-                <formatter type="plain"/>
-                <formatter type="xml"/>
-                <batchtest fork="yes" todir="report">
-                    <fileset dir="bintest" includes="**/*Test.class"/>
-                </batchtest>
-            </junit>
-        </jacoco:coverage>
+        <jacoco:agent enabled="@{coverage}" includes="${jacoco.includes}"
+                      inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}" property="jacocoagent@{testfamily}@{testITsuffix}" if:true="@{coverage}"/>
+        <junitlauncher printsummary="yes">
+            <classpath>
+                <path refid="testlib.classpath"/>
+                <path refid="test.classpath"/>
+                <pathelement location="bintest"/>
+            </classpath>
+            <testclasses outputdir="report">
+                <fileset dir="bintest" includes="**/*Test.class"/>
+                <fork>
+                    <jvmarg value="-Dfile.encoding=UTF-8"/>
+                </fork>
+                <listener type="legacy-brief" sendSysOut="true" sendSysErr="true"/>
+                <listener type="legacy-plain" />
+                <listener type="legacy-xml" />
+            </testclasses>
+        </junitlauncher>
     </target>
 

applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/TileRangeTest.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer;
 
-import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests of {@link TileRange} class.
  */
-public class TileRangeTest {
+class TileRangeTest {
 
     /**
@@ -15 +16 @@
      */
     @Test
-    public void testSize() {
+    void testSize() {
         assertEquals(16, new TileRange(
                 new TileXY(3, 3), 

applications/viewer/jmapviewer/test/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSourceTest.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.text.MessageFormat;
@@ -11 +11 @@
 import java.util.stream.Stream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
@@ -49 +49 @@
      */
     @Test
-    public void testGetTileUrl() {
+    void testGetTileUrl() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{y}",
@@ -61 +61 @@
      */
     @Test
-    public void testGetTileUrl_positive_zoom() {
+    void testGetTileUrl_positive_zoom() {
         checkGetTileUrl(
                 "http://localhost/{zoom+5}/{x}/{y}",
@@ -73 +73 @@
      */
     @Test
-    public void testGetTileUrl_negative_zoom() {
+    void testGetTileUrl_negative_zoom() {
         checkGetTileUrl(
                 "http://localhost/{zoom-5}/{x}/{y}",
@@ -85 +85 @@
      */
     @Test
-    public void testGetTileUrl_inverse_negative_zoom() {
+    void testGetTileUrl_inverse_negative_zoom() {
         checkGetTileUrl(
                 "http://localhost/{5-zoom}/{x}/{y}",
@@ -97 +97 @@
      */
     @Test
-    public void testGetTileUrl_both_offsets() {
+    void testGetTileUrl_both_offsets() {
         checkGetTileUrl(
                 "http://localhost/{10-zoom-5}/{x}/{y}",
@@ -109 +109 @@
      */
     @Test
-    public void testGetTileUrl_apiKey() {
+    void testGetTileUrl_apiKey() {
         System.setProperty("id1.api-key", "wololo");
         TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", "http://localhost/{zoom}/{x}/{y}?token={apikey}&foo=bar", "id1");
@@ -120 +120 @@
      */
     @Test
-    public void testGetTileUrl_switch() {
+    void testGetTileUrl_switch() {
         TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", "http://{switch:a,b,c}.localhost/{10-zoom-5}/{x}/{y}", "id1");
         TemplatedTMSTileSource ts = new TemplatedTMSTileSource(testImageryTMS);
@@ -159 +159 @@
 
     @Test
-    public void testGetTileUrl_yahoo() {
+    void testGetTileUrl_yahoo() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{!y}",
@@ -169 +169 @@
 
     @Test
-    public void testGetTileUrl_negative_y() {
+    void testGetTileUrl_negative_y() {
         checkGetTileUrl(
                 "http://localhost/{z}/{x}/{-y}",
@@ -189 +189 @@
      */
     @Test
-    public void testAllUrls() {
+    void testAllUrls() {
         for (String[] test: TEST_DATA) {
             TileSourceInfo testImageryTMS = new TileSourceInfo("test imagery", test[0], "id1");