From 5cebc2b7f809af7d5271730319fb569dfd7b563d Mon Sep 17 00:00:00 2001
From: David Arthur <mumrah@gmail.com>
Date: Fri, 5 Apr 2013 12:32:04 -0400
Subject: [PATCH 2/3] Tests all passing

---
 build.xml |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 ivy.xml   |   13 +++++++++--
 2 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 0f61d97..ed8a9c9 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,9 @@
   <property name="lib.dir" value="lib-ant"/>
 
   <property name="src.dir" value="core/src/main/scala"/>
+  <property name="test.src.dir" value="core/src/test/scala/unit"/>
   <property name="classes.dir" value="${build.dir}/classes"/>
+  <property name="test.classes.dir" value="${build.dir}/test-classes"/>
 
   <property name="assembly.dir" value="${build.dir}/assembly"/>
 
@@ -62,6 +64,7 @@
   </target>
 
   <!-- Scala -->
+
   <target name="scala-init" depends="ivy-init">
     <ivy:resolve conf="scalac"/>
     <ivy:retrieve conf="scalac" pattern="${lib.dir}/ivy/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
@@ -84,7 +87,7 @@
       <classpath>
         <fileset dir="${lib.dir}" includes="ivy/compile/*.jar"/>
         <fileset dir="${lib.dir}" includes="managed/*.jar"/>
-        <fileset dir="${classes.dir}"/>
+        <dirset dir="${classes.dir}"/>
       </classpath>
       <include name="**/*.scala"/>
       <include name="**/*.java"/>
@@ -93,12 +96,73 @@
       <classpath>
         <fileset dir="${lib.dir}" includes="ivy/compile/*.jar"/>
         <fileset dir="${lib.dir}" includes="managed/*.jar"/>
-        <fileset dir="${classes.dir}"/>
+        <dirset dir="${classes.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </javac>
+  </target>
+
+  <target name="compile-test" depends="ivy-resolve,scala-init,compile" description="compile the source">
+    <mkdir dir="${test.classes.dir}"/>
+    <scalac srcdir="${test.src.dir}" destdir="${test.classes.dir}" encoding="UTF-8">
+      <classpath>
+        <fileset dir="${lib.dir}" includes="ivy/test/*.jar"/>
+        <fileset dir="${lib.dir}" includes="managed/*.jar"/>
+        <dirset dir="${classes.dir}"/>
+        <dirset dir="${test.classes.dir}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <include name="**/*.java"/>
+    </scalac>
+    <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" encoding="UTF-8">
+      <classpath>
+        <fileset dir="${lib.dir}" includes="ivy/test/*.jar"/>
+        <fileset dir="${lib.dir}" includes="managed/*.jar"/>
+        <dirset dir="${classes.dir}"/>
+        <dirset dir="${test.classes.dir}"/>
       </classpath>
       <include name="**/*.java"/>
     </javac>
   </target>
 
+  <target name="test" depends="compile-test">
+    <delete dir="${build.dir}/test-reports"/>
+    <mkdir dir="${build.dir}/test-reports"/>
+    <junit printsummary="true" showoutput="true" forkmode="perBatch" fork="true">
+      <formatter type="xml"/>
+      <classpath>
+        <fileset dir="${lib.dir}" includes="ivy/test/*.jar"/>
+        <fileset dir="${lib.dir}" includes="managed/*.jar"/>
+        <dirset dir="${classes.dir}"/>
+        <dirset dir="${test.classes.dir}"/>
+      </classpath>
+      <batchtest todir="${build.dir}/test-reports">
+        <fileset dir="${test.classes.dir}">
+          <include name="**/Test*.class"/>
+          <include name="**/*Test.class"/>
+          <exclude name="**/*$*.class"/>
+          <exclude name="**/TestUtils.class"/>
+          <exclude name="**/TestZKUtils.class"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-only" depends="compile-test" if="test.class">
+    <delete dir="${build.dir}/test-reports"/>
+    <mkdir dir="${build.dir}/test-reports"/>
+    <junit printsummary="true" showoutput="true">
+      <formatter type="xml"/>
+      <classpath>
+        <fileset dir="${lib.dir}" includes="ivy/test/*.jar"/>
+        <fileset dir="${lib.dir}" includes="managed/*.jar"/>
+        <dirset dir="${classes.dir}"/>
+        <dirset dir="${test.classes.dir}"/>
+      </classpath>
+      <test name="${test.class}" todir="${build.dir}/test-reports"/>
+    </junit>
+  </target>
+
   <target name="jar" depends="compile" description="bundle up the jars">
     <mkdir dir="${build.dir}"/>
     <jar jarfile="${build.dir}/${ant.project.name}-${version}.jar" basedir="${classes.dir}"/>
diff --git a/ivy.xml b/ivy.xml
index 5b0b0cb..f8b126e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -7,8 +7,9 @@
     <conf name="default"/>
     <conf name="scala"/>
     <conf name="scalac" extends="scala"/>
-    <conf name="compile" extends="default,scalac"/>
+    <conf name="compile" extends="default,scala"/>
     <conf name="runtime" extends="default,scala"/>
+    <conf name="test" extends="runtime"/>
   </configurations>
 
   <publications>
@@ -16,8 +17,8 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.scala-lang" name="scala-library" rev="2.8.2" conf="scala->default"/>
-    <dependency org="org.scala-lang" name="scala-compiler" rev="2.8.2" conf="scalac->default"/>
+    <dependency org="org.scala-lang" name="scala-library" rev="2.9.1" conf="scala->default"/>
+    <dependency org="org.scala-lang" name="scala-compiler" rev="2.9.1" conf="scalac->default"/>
 
     <dependency org="net.sf.jopt-simple" name="jopt-simple" rev="3.2" conf="default->default"/>
     <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.4" conf="default->default"/>
@@ -29,6 +30,12 @@
     <dependency org="log4j" name="log4j" rev="1.2.15" conf="default->default"/>
     <dependency org="org.slf4j" name="slf4j-simple" rev="1.6.4" conf="runtime->default"/>
 
+    <dependency org="junit" name="junit" rev="4.1" conf="test->default"/>
+    <dependency org="org.scalatest" name="scalatest" rev="1.2" conf="test->default"/>
+    <dependency org="org.objenesis" name="objenesis" rev="1.2" conf="test->default"/>
+    <dependency org="cglib" name="cglib-nodep" rev="2.2" conf="test->default"/>
+    <dependency org="org.easymock" name="easymock" rev="3.0" conf="test->default"/>
+
     <exclude org="jline"/>
     <exclude org="javax.jms"/>
     <exclude org="javax.mail"/>
-- 
1.7.5.4