Changeset 18673 in josm

Timestamp:

2023-02-21T22:53:08+01:00 (15 months ago)

Author:

taylor.smock

Message:

Ensure that the test META-INF/services directory is actually available on the test class

This should ensure that automatically registered extensions actually get run
in Eclipse and ant (IDEA autodiscovers them, assuming that the test/data
folder has been set as a resource folder). This only affects extensions from
JOSM, not from dependencies.

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)

trunk/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/XZUtils.java|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/compressors/zstandard/|org/apache/commons/compress/parallel/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs3/JCS.java|org/apache/commons/jcs3/access/GroupCacheAccess.java|org/apache/commons/jcs3/access/PartitionedCacheAccess.java|org/apache/commons/jcs3/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs3/access/exception/InvalidGroupException.java|org/apache/commons/jcs3/admin/servlet/|org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs3/auxiliary/disk/jdbc/|org/apache/commons/jcs3/auxiliary/lateral/|org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs3/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs3/auxiliary/remote/http/|org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs3/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs3/engine/CacheAdaptor.java|org/apache/commons/jcs3/engine/CacheGroup.java|org/apache/commons/jcs3/engine/CacheWatchRepairable.java|org/apache/commons/jcs3/engine/ZombieCacheService.java|org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs3/engine/ZombieCacheWatch.java|org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs3/utils/access/|org/apache/commons/jcs3/utils/discovery/|org/apache/commons/jcs3/utils/net/|org/apache/commons/jcs3/utils/props/|org/apache/commons/jcs3/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/" kind="src" path="src"/>
+        <classpathentry including="META-INF/**" kind="src" output="bintest" path="test/data">
+                <attributes>
+                        <attribute name="test" value="true"/>
+                </attributes>
+        </classpathentry>
         <classpathentry kind="src" path="resources"/>
         <classpathentry kind="src" output="bintest" path="test/unit">

trunk/build.xml

@@ -415 +415 @@
                 </classpath>
             </javac>
+            <copy todir="${test.dir}/build/@{testfamily}/META-INF">
+              <fileset dir="${test.dir}/data/META-INF"/>
+            </copy>
         </sequential>
     </macrodef>