Changeset 7063 in josm for trunk

Timestamp:

2014-05-04T23:59:19+02:00 (10 years ago)

Author:

Don-vip

Message:

compile and run all tests, including Groovy ones

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/BoundsTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/data/BoundsTests.java ) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java ) (1 diff)
• tools/groovy-all-2.2.2.jar (added)

trunk/build.xml

@@ -259 +259 @@
         </fileset>
         <pathelement path="dist/josm-custom.jar"/>
+        <pathelement path="tools/groovy-all-2.2.2.jar"/>
     </path>
     <target name="test-init">
@@ -270 +271 @@
     </target>
     <target name="test-compile" depends="test-init,dist">
-        <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
-                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
-            <compilerarg value="-Xlint:all"/>
-            <compilerarg value="-Xlint:-serial"/>
-        </javac>
-        <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
-                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
-            <compilerarg value="-Xlint:all"/>
-            <compilerarg value="-Xlint:-serial"/>
-        </javac>
-        <javac srcdir="${test.dir}/performance" classpathref="test.classpath" destdir="${test.dir}/build" target="1.7" source="1.7" debug="on"
-                includeantruntime="false" createMissingPackageInfoClass="off" encoding="UTF-8">
-            <compilerarg value="-Xlint:all"/>
-            <compilerarg value="-Xlint:-serial"/>
-        </javac>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.2.2.jar"/>
+        <groovyc classpathref="test.classpath" destdir="${test.dir}/build" encoding="UTF-8">
+                <src path="${test.dir}/unit"/>
+            <src path="${test.dir}/functional"/>
+            <src path="${test.dir}/performance"/>
+                <javac target="1.7" source="1.7" debug="on">
+                <compilerarg value="-Xlint:all"/>
+                <compilerarg value="-Xlint:-serial"/>
+                </javac>
+        </groovyc>
     </target>
     <target name="test" depends="test-compile">
@@ -302 +298 @@
                 <formatter type="xml"/>
                 <batchtest fork="yes" todir="${test.dir}/report">
-                    <fileset dir="${test.dir}/unit" includes="**/*.java"/>
+                    <fileset dir="${test.dir}/build" includes="**/*Test.class"/>
                 </batchtest>
             </junit>

trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java

@@ -6 +6 @@
 import static org.junit.Assert.assertTrue;
 
-public class BoundsTests {
+public class BoundsTest {
 
     @Test

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java

@@ -14 +14 @@
  *
  */
-public class OsmPrimitiveKeyHandling {
+public class OsmPrimitiveKeyHandlingTest {
 
     @BeforeClass