From f63bb9a27f0c03544cea40f86166dbf367288313 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 14 Sep 2010 19:43:02 +0000
Subject: [PATCH] Moved src/java into src/main/java, added src/test/java, added
 build targets for tests. Some changes (and tests to make sure I'm not fucking
 things up) forthcoming.

---
 build.xml                                     | 70 ++++++++++---------
 libs-incl.xml                                 |  1 +
 .../java/com/threerings/getdown/Log.java      |  0
 .../threerings/getdown/data/Application.java  |  0
 .../com/threerings/getdown/data/Digest.java   |  0
 .../threerings/getdown/data/Properties.java   |  0
 .../com/threerings/getdown/data/Resource.java |  0
 .../getdown/launcher/AbortPanel.java          |  0
 .../threerings/getdown/launcher/Getdown.java  |  0
 .../getdown/launcher/GetdownApp.java          |  0
 .../getdown/launcher/GetdownApplet.java       |  0
 .../getdown/launcher/GetdownAppletConfig.java |  0
 .../getdown/launcher/ImageLoader.java         |  0
 .../launcher/MultipleGetdownRunning.java      |  0
 .../getdown/launcher/ProxyPanel.java          |  0
 .../getdown/launcher/RotatingBackgrounds.java |  0
 .../getdown/launcher/StatusPanel.java         |  0
 .../threerings/getdown/messages.properties    |  0
 .../threerings/getdown/messages_de.properties |  0
 .../threerings/getdown/messages_ja.properties |  0
 .../threerings/getdown/messages_zh.properties |  2 +-
 .../getdown/net/DownloadAbortedException.java |  0
 .../threerings/getdown/net/Downloader.java    |  0
 .../getdown/net/HTTPDownloader.java           |  0
 .../getdown/net/TorrentDownloader.java        |  0
 .../getdown/tools/AppletParamSigner.java      |  0
 .../com/threerings/getdown/tools/Differ.java  |  0
 .../getdown/tools/DigesterTask.java           |  0
 .../getdown/tools/JarDiffPatcher.java         |  0
 .../com/threerings/getdown/tools/Patcher.java |  0
 .../threerings/getdown/util/ConfigUtil.java   |  0
 .../com/threerings/getdown/util/FileUtil.java |  0
 .../threerings/getdown/util/LaunchUtil.java   |  0
 .../getdown/util/MetaProgressObserver.java    |  0
 .../getdown/util/ProgressObserver.java        |  0
 35 files changed, 40 insertions(+), 33 deletions(-)
 rename src/{ => main}/java/com/threerings/getdown/Log.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/data/Application.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/data/Digest.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/data/Properties.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/data/Resource.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/AbortPanel.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/Getdown.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/GetdownApp.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/GetdownApplet.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/GetdownAppletConfig.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/ImageLoader.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/MultipleGetdownRunning.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/ProxyPanel.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/RotatingBackgrounds.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/launcher/StatusPanel.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/messages.properties (100%)
 rename src/{ => main}/java/com/threerings/getdown/messages_de.properties (100%)
 rename src/{ => main}/java/com/threerings/getdown/messages_ja.properties (100%)
 rename src/{ => main}/java/com/threerings/getdown/messages_zh.properties (98%)
 rename src/{ => main}/java/com/threerings/getdown/net/DownloadAbortedException.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/net/Downloader.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/net/HTTPDownloader.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/net/TorrentDownloader.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/tools/AppletParamSigner.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/tools/Differ.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/tools/DigesterTask.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/tools/JarDiffPatcher.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/tools/Patcher.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/util/ConfigUtil.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/util/FileUtil.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/util/LaunchUtil.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/util/MetaProgressObserver.java (100%)
 rename src/{ => main}/java/com/threerings/getdown/util/ProgressObserver.java (100%)

diff --git a/build.xml b/build.xml
index b680e39..3dcb1c3 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,8 @@
 
   <!-- various basic settings -->
   <property name="app.name" value="getdown"/>
-  <property name="src.dir" value="src/java"/>
+  <property name="src.dir" value="src/main/java"/>
+  <property name="test.dir" value="src/test/java"/>
   <property name="deploy.dir" value="dist"/>
   <property name="libs.dir" value="lib"/>
   <import file="libs-incl.xml"/>
@@ -46,6 +47,7 @@
   <target name="prepare">
     <mkdir dir="${deploy.dir}/lib"/>
     <mkdir dir="${deploy.dir}/classes"/>
+    <mkdir dir="${deploy.dir}/test-classes"/>
     <mkdir dir="${javadoc.dir}"/>
     <!-- copy media and properties into the target directory -->
     <copy todir="${deploy.dir}/classes">
@@ -67,6 +69,7 @@
   <!-- cleans out the intermediate build files -->
   <target name="clean">
     <delete dir="${deploy.dir}/classes"/>
+    <delete dir="${deploy.dir}/test-classes"/>
     <delete dir="${deploy.dir}/docs"/>
   </target>
 
@@ -75,15 +78,26 @@
     <delete dir="${deploy.dir}"/>
   </target>
 
-  <!-- build the java class files -->
-  <target name="compile" depends="check-available">
+  <target name="compile" depends="check-available" description="Compiles main classes.">
     <javac srcdir="${src.dir}" destdir="${deploy.dir}/classes"
-           debug="on" optimize="off" deprecation="on"
            classpathref="clazzpath" includeAntRuntime="no"
-           source="1.5" target="1.5">
+           debug="on" deprecation="on" source="1.5" target="1.5">
       <exclude name="**/TorrentDownloader*" unless="build.torrent"/>
       <exclude name="**/tools/Differ*" unless="build.differ"/>
-      <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+  </target>
+
+  <target name="test-compile" depends="compile" description="Compiles test classes.">
+    <javac srcdir="${test.dir}" destdir="${deploy.dir}/test-classes" includeAntRuntime="false"
+           debug="on" deprecation="on" source="1.5" target="1.5" encoding="utf-8">
+      <classpath>
+        <path refid="clazzpath"/>
+        <pathelement location="${deploy.dir}/classes"/>
+      </classpath>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
     </javac>
   </target>
 
@@ -111,6 +125,24 @@
          basedir="${deploy.dir}/classes" excludes="**/netscape/**"/>
   </target>
 
+  <property name="test" value=""/>
+  <target name="tests" depends="test-compile"
+          description="Runs unit tests. Use -Dtest=Foo to run only FooTest.">
+    <taskdef name="unit" classpathref="clazzpath"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+    <unit printsummary="off" haltonfailure="yes">
+      <classpath>
+        <pathelement location="${deploy.dir}/classes"/>
+        <pathelement location="${deploy.dir}/test-classes"/>
+        <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
+      </classpath>
+      <formatter type="brief" usefile="false"/>
+      <batchtest>
+        <fileset dir="${test.dir}" includes="**/*${test}*Test.java"/>
+      </batchtest>
+    </unit>
+  </target>
+
   <!-- optimizes, combines and removes dead code -->
   <target name="proguard" depends="dist">
     <!-- we need ant-contrib for if -->
@@ -152,30 +184,4 @@
       keystore="${sign.keystore}" storepass="${sign.storepass}"
       alias="${sign.alias}" keypass="${sign.keypass}"/>
   </target>
-
-  <!-- creates a zipfile with our source distribution -->
-  <target name="snapshot" depends="proguard">
-     <echo message="You may want to stop and run 'ant savedoc' first."/>
-     <delete file="${deploy.dir}/${app.name}-snapshot.zip"/>
-     <mkdir dir="${deploy.dir}/snapshot/${app.name}"/>
-     <copy todir="${deploy.dir}/snapshot/${app.name}">
-       <fileset dir=".">
-         <include name="**"/>
-         <exclude name="${deploy.dir}/**"/>
-         <exclude name="tests/dist/**"/>
-         <exclude name="${app.name}-*.zip"/>
-       </fileset>
-     </copy>
-     <copy todir="${deploy.dir}/snapshot/${app.name}" file="${deploy.dir}/${app.name}-pro.jar"/>
-     <copy todir="${deploy.dir}/snapshot/${app.name}"
-           file="${deploy.dir}/${app.name}-retro-pro.jar"/>
-     <copy todir="${deploy.dir}/snapshot/${app.name}/lib">
-       <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
-     </copy>
-     <copy todir="${deploy.dir}/snapshot/${app.name}/docs/api">
-       <fileset dir="${deploy.dir}/docs" includes="**"/>
-     </copy>
-     <zip destfile="${deploy.dir}/${app.name}-snapshot.zip" basedir="${deploy.dir}/snapshot"/>
-     <delete dir="${deploy.dir}/snapshot"/>
-  </target>
 </project>
diff --git a/libs-incl.xml b/libs-incl.xml
index c6dfcc6..12d69a5 100644
--- a/libs-incl.xml
+++ b/libs-incl.xml
@@ -9,5 +9,6 @@
     <include name="retroweaver-rt-1.2.2.jar"/>
     <include name="samskivert.jar"/>
     <include name="snark.jar"/>
+    <include name="junit4.jar"/>
   </fileset>
 </project>
diff --git a/src/java/com/threerings/getdown/Log.java b/src/main/java/com/threerings/getdown/Log.java
similarity index 100%
rename from src/java/com/threerings/getdown/Log.java
rename to src/main/java/com/threerings/getdown/Log.java
diff --git a/src/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java
similarity index 100%
rename from src/java/com/threerings/getdown/data/Application.java
rename to src/main/java/com/threerings/getdown/data/Application.java
diff --git a/src/java/com/threerings/getdown/data/Digest.java b/src/main/java/com/threerings/getdown/data/Digest.java
similarity index 100%
rename from src/java/com/threerings/getdown/data/Digest.java
rename to src/main/java/com/threerings/getdown/data/Digest.java
diff --git a/src/java/com/threerings/getdown/data/Properties.java b/src/main/java/com/threerings/getdown/data/Properties.java
similarity index 100%
rename from src/java/com/threerings/getdown/data/Properties.java
rename to src/main/java/com/threerings/getdown/data/Properties.java
diff --git a/src/java/com/threerings/getdown/data/Resource.java b/src/main/java/com/threerings/getdown/data/Resource.java
similarity index 100%
rename from src/java/com/threerings/getdown/data/Resource.java
rename to src/main/java/com/threerings/getdown/data/Resource.java
diff --git a/src/java/com/threerings/getdown/launcher/AbortPanel.java b/src/main/java/com/threerings/getdown/launcher/AbortPanel.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/AbortPanel.java
rename to src/main/java/com/threerings/getdown/launcher/AbortPanel.java
diff --git a/src/java/com/threerings/getdown/launcher/Getdown.java b/src/main/java/com/threerings/getdown/launcher/Getdown.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/Getdown.java
rename to src/main/java/com/threerings/getdown/launcher/Getdown.java
diff --git a/src/java/com/threerings/getdown/launcher/GetdownApp.java b/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/GetdownApp.java
rename to src/main/java/com/threerings/getdown/launcher/GetdownApp.java
diff --git a/src/java/com/threerings/getdown/launcher/GetdownApplet.java b/src/main/java/com/threerings/getdown/launcher/GetdownApplet.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/GetdownApplet.java
rename to src/main/java/com/threerings/getdown/launcher/GetdownApplet.java
diff --git a/src/java/com/threerings/getdown/launcher/GetdownAppletConfig.java b/src/main/java/com/threerings/getdown/launcher/GetdownAppletConfig.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/GetdownAppletConfig.java
rename to src/main/java/com/threerings/getdown/launcher/GetdownAppletConfig.java
diff --git a/src/java/com/threerings/getdown/launcher/ImageLoader.java b/src/main/java/com/threerings/getdown/launcher/ImageLoader.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/ImageLoader.java
rename to src/main/java/com/threerings/getdown/launcher/ImageLoader.java
diff --git a/src/java/com/threerings/getdown/launcher/MultipleGetdownRunning.java b/src/main/java/com/threerings/getdown/launcher/MultipleGetdownRunning.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/MultipleGetdownRunning.java
rename to src/main/java/com/threerings/getdown/launcher/MultipleGetdownRunning.java
diff --git a/src/java/com/threerings/getdown/launcher/ProxyPanel.java b/src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/ProxyPanel.java
rename to src/main/java/com/threerings/getdown/launcher/ProxyPanel.java
diff --git a/src/java/com/threerings/getdown/launcher/RotatingBackgrounds.java b/src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/RotatingBackgrounds.java
rename to src/main/java/com/threerings/getdown/launcher/RotatingBackgrounds.java
diff --git a/src/java/com/threerings/getdown/launcher/StatusPanel.java b/src/main/java/com/threerings/getdown/launcher/StatusPanel.java
similarity index 100%
rename from src/java/com/threerings/getdown/launcher/StatusPanel.java
rename to src/main/java/com/threerings/getdown/launcher/StatusPanel.java
diff --git a/src/java/com/threerings/getdown/messages.properties b/src/main/java/com/threerings/getdown/messages.properties
similarity index 100%
rename from src/java/com/threerings/getdown/messages.properties
rename to src/main/java/com/threerings/getdown/messages.properties
diff --git a/src/java/com/threerings/getdown/messages_de.properties b/src/main/java/com/threerings/getdown/messages_de.properties
similarity index 100%
rename from src/java/com/threerings/getdown/messages_de.properties
rename to src/main/java/com/threerings/getdown/messages_de.properties
diff --git a/src/java/com/threerings/getdown/messages_ja.properties b/src/main/java/com/threerings/getdown/messages_ja.properties
similarity index 100%
rename from src/java/com/threerings/getdown/messages_ja.properties
rename to src/main/java/com/threerings/getdown/messages_ja.properties
diff --git a/src/java/com/threerings/getdown/messages_zh.properties b/src/main/java/com/threerings/getdown/messages_zh.properties
similarity index 98%
rename from src/java/com/threerings/getdown/messages_zh.properties
rename to src/main/java/com/threerings/getdown/messages_zh.properties
index 8164b57..b3d6da4 100644
--- a/src/java/com/threerings/getdown/messages_zh.properties
+++ b/src/main/java/com/threerings/getdown/messages_zh.properties
@@ -1,5 +1,5 @@
 #
-# $Id: messages_zh.properties,v 1.2 2004/08/03 00:39:35 mdb Exp $
+# $Id$
 #
 # Getdown translation messages
 
diff --git a/src/java/com/threerings/getdown/net/DownloadAbortedException.java b/src/main/java/com/threerings/getdown/net/DownloadAbortedException.java
similarity index 100%
rename from src/java/com/threerings/getdown/net/DownloadAbortedException.java
rename to src/main/java/com/threerings/getdown/net/DownloadAbortedException.java
diff --git a/src/java/com/threerings/getdown/net/Downloader.java b/src/main/java/com/threerings/getdown/net/Downloader.java
similarity index 100%
rename from src/java/com/threerings/getdown/net/Downloader.java
rename to src/main/java/com/threerings/getdown/net/Downloader.java
diff --git a/src/java/com/threerings/getdown/net/HTTPDownloader.java b/src/main/java/com/threerings/getdown/net/HTTPDownloader.java
similarity index 100%
rename from src/java/com/threerings/getdown/net/HTTPDownloader.java
rename to src/main/java/com/threerings/getdown/net/HTTPDownloader.java
diff --git a/src/java/com/threerings/getdown/net/TorrentDownloader.java b/src/main/java/com/threerings/getdown/net/TorrentDownloader.java
similarity index 100%
rename from src/java/com/threerings/getdown/net/TorrentDownloader.java
rename to src/main/java/com/threerings/getdown/net/TorrentDownloader.java
diff --git a/src/java/com/threerings/getdown/tools/AppletParamSigner.java b/src/main/java/com/threerings/getdown/tools/AppletParamSigner.java
similarity index 100%
rename from src/java/com/threerings/getdown/tools/AppletParamSigner.java
rename to src/main/java/com/threerings/getdown/tools/AppletParamSigner.java
diff --git a/src/java/com/threerings/getdown/tools/Differ.java b/src/main/java/com/threerings/getdown/tools/Differ.java
similarity index 100%
rename from src/java/com/threerings/getdown/tools/Differ.java
rename to src/main/java/com/threerings/getdown/tools/Differ.java
diff --git a/src/java/com/threerings/getdown/tools/DigesterTask.java b/src/main/java/com/threerings/getdown/tools/DigesterTask.java
similarity index 100%
rename from src/java/com/threerings/getdown/tools/DigesterTask.java
rename to src/main/java/com/threerings/getdown/tools/DigesterTask.java
diff --git a/src/java/com/threerings/getdown/tools/JarDiffPatcher.java b/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
similarity index 100%
rename from src/java/com/threerings/getdown/tools/JarDiffPatcher.java
rename to src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
diff --git a/src/java/com/threerings/getdown/tools/Patcher.java b/src/main/java/com/threerings/getdown/tools/Patcher.java
similarity index 100%
rename from src/java/com/threerings/getdown/tools/Patcher.java
rename to src/main/java/com/threerings/getdown/tools/Patcher.java
diff --git a/src/java/com/threerings/getdown/util/ConfigUtil.java b/src/main/java/com/threerings/getdown/util/ConfigUtil.java
similarity index 100%
rename from src/java/com/threerings/getdown/util/ConfigUtil.java
rename to src/main/java/com/threerings/getdown/util/ConfigUtil.java
diff --git a/src/java/com/threerings/getdown/util/FileUtil.java b/src/main/java/com/threerings/getdown/util/FileUtil.java
similarity index 100%
rename from src/java/com/threerings/getdown/util/FileUtil.java
rename to src/main/java/com/threerings/getdown/util/FileUtil.java
diff --git a/src/java/com/threerings/getdown/util/LaunchUtil.java b/src/main/java/com/threerings/getdown/util/LaunchUtil.java
similarity index 100%
rename from src/java/com/threerings/getdown/util/LaunchUtil.java
rename to src/main/java/com/threerings/getdown/util/LaunchUtil.java
diff --git a/src/java/com/threerings/getdown/util/MetaProgressObserver.java b/src/main/java/com/threerings/getdown/util/MetaProgressObserver.java
similarity index 100%
rename from src/java/com/threerings/getdown/util/MetaProgressObserver.java
rename to src/main/java/com/threerings/getdown/util/MetaProgressObserver.java
diff --git a/src/java/com/threerings/getdown/util/ProgressObserver.java b/src/main/java/com/threerings/getdown/util/ProgressObserver.java
similarity index 100%
rename from src/java/com/threerings/getdown/util/ProgressObserver.java
rename to src/main/java/com/threerings/getdown/util/ProgressObserver.java