Changeset 32326 in osm

Timestamp:

2016-06-19T15:19:44+02:00 (8 years ago)

Author:

donvip

Message:

use a single test config directory for all plugins. This simplifies the tree structure, and speeds up SVN operations as the increase of svn:externals entries slows down every svn update command

Location:

applications/editors/josm/plugins

Files:

• . (modified) (1 prop)
• ElevationProfile/test (modified) (1 prop)
• ImportImagePlugin/test (modified) (1 prop)
• alignways/test (modified) (1 prop)
• build-common.xml (modified) (3 diffs)
• graphview/test (modified) (1 prop)
• indoorhelper/test (modified) (1 prop)
• mapillary/test (modified) (1 prop)
• opendata/test (modified) (1 prop)
• photo_geotagging/test (modified) (1 prop)
• pt_assistant/test (modified) (1 prop)
• tag2link/test (modified) (1 prop)
• turnrestrictions/test (modified) (1 prop)
• utilsplugin2/test (modified) (1 prop)
• wikipedia/test (modified) (1 prop)

applications/editors/josm/plugins

@@ -5 +5 @@
 https://github.com/JOSM/tofix-plugin/trunk tofix
 https://github.com/JOSM/JOSM-continuos-download/trunk continuosDownload
+https://josm.openstreetmap.de/svn/trunk/test/config 00_core_test_config

@@ -5 +5 @@
 https://github.com/JOSM/tofix-plugin/trunk tofix
 https://github.com/JOSM/JOSM-continuos-download/trunk continuosDownload
+https://josm.openstreetmap.de/svn/trunk/test/config 00_core_test_config

applications/editors/josm/plugins/build-common.xml

@@ -432 +432 @@
     <macrodef name="init-test-preferences">
         <sequential>
-            <copy file="${plugin.test.dir}/config/preferences.template.xml" tofile="${plugin.test.dir}/config/unit-josm.home/preferences.xml"/>
-            <replace file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_USERNAME@" value="${osm.username}"/>
-            <replace file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_PASSWORD@" value="${osm.password}"/>
+            <copy file="../00_core_test_config/preferences.template.xml" tofile="../00_core_test_config/unit-josm.home/preferences.xml"/>
+            <replace file="../00_core_test_config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_USERNAME@" value="${osm.username}"/>
+            <replace file="../00_core_test_config/unit-josm.home/preferences.xml" encoding="UTF-8" token="@OSM_PASSWORD@" value="${osm.password}"/>
         </sequential>
     </macrodef>
@@ -450 +450 @@
         <delete dir="${plugin.test.dir}/report"/>
         <delete file="${plugin.test.dir}/jacoco.exec" />
-        <delete file="${plugin.test.dir}/config/unit-josm.home/preferences.xml" />
-        <delete dir="${plugin.test.dir}/config/unit-josm.home/cache" failonerror="false"/>
+        <delete file="../00_core_test_config/unit-josm.home/preferences.xml" />
+        <delete dir="../00_core_test_config/unit-josm.home/cache" failonerror="false"/>
     </target>
     <target name="test-compile" depends="test-init,dist" if="test.present">
@@ -476 +476 @@
                 <junit printsummary="yes" fork="true" forkmode="once" dir="${basedir}">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <sysproperty key="josm.home" value="${plugin.test.dir}/config/unit-josm.home"/>
+                    <sysproperty key="josm.home" value="../00_core_test_config/unit-josm.home"/>
                     <sysproperty key="josm.test.data" value="${plugin.test.dir}/data"/>
                     <sysproperty key="java.awt.headless" value="true"/>

@@ -5 +5 @@
 https://github.com/JOSM/tofix-plugin/trunk tofix
 https://github.com/JOSM/JOSM-continuos-download/trunk continuosDownload
+https://josm.openstreetmap.de/svn/trunk/test/config 00_core_test_config