Restructured directories. Added clojure.jar and clojure-contrib.jar t…

…o libs.
mdelaurentis · Sep 10, 2009 · 2058124 · 2058124
1 parent e47e10d
commit 2058124
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/build.xml b/build.xml
@@ -8,14 +8,14 @@
   <property name="clj.src.dir" location="src/clj"/>
   <property name="java.src.dir" location="src/java"/>
   <property name="java.interfaces.src.dir" location="src/java-interfaces"/>
-  <property name="java.test.src.dir" location="test/java"/>
-  <property name="test.lib.dir" location="deps"/>
+  <property name="java.test.src.dir" location="test/src/java"/>
+  <property name="test.lib.dir" location="test/lib"/>
+  <property name="lib.dir" location="lib"/>
 
   <path id="classpath">
     <pathelement location="${clj.src.dir}"/>
     <pathelement location="${build.dir}"/>
-    <pathelement location="/Users/mdelaurentis/src/clojure/clojure.jar"/>
-    <pathelement location="/Users/mdelaurentis/src/clojure-contrib/clojure-contrib.jar"/>    
+    <fileset dir="${lib.dir}" includes="**/*.jar"/> 
   </path>
 
   <path id="test.classpath">
@@ -80,7 +80,7 @@
     <delete file="hsql.log"/>
     <delete file="hsql.script"/>
     <delete file="hsql.properties"/>
-    <delete file="hsql.tmp"/>
+    <delete dir="hsql.tmp"/>
   </target>
 
   <target name="compile-test" depends="compile,init">

diff --git a/lib/clojure-contrib.jar b/lib/clojure-contrib.jar
diff --git a/lib/clojure.jar b/lib/clojure.jar
diff --git a/test-input/breeds.tab → sample-data/breeds.tab b/test-input/breeds.tab → sample-data/breeds.tab
diff --git a/test-input/breeds.txt → sample-data/breeds.txt b/test-input/breeds.txt → sample-data/breeds.txt
diff --git a/src/clj/com/mdelaurentis/anytable/test.clj b/src/clj/com/mdelaurentis/anytable/test.clj
@@ -25,12 +25,12 @@
 
 (deftest test-read-tab
   (is (= (record-seq breeds)
-         (record-seq (copy (tab-table "test-input/breeds.tab")
+         (record-seq (copy (tab-table "sample-data/breeds.tab")
                            (vector-table))))))
 
 (deftest test-read-fixed-width
   (is (= (record-seq breeds)
-         (record-seq (copy  (fixed-width-table "test-input/breeds.txt"
+         (record-seq (copy  (fixed-width-table "sample-data/breeds.txt"
                                                "breed"    12
                                                "category"  5
                                                "size"      6)

diff --git a/deps/hsqldb.jar → test/lib/deps/hsqldb.jar b/deps/hsqldb.jar → test/lib/deps/hsqldb.jar
diff --git a/deps/junit-4.7.jar → test/lib/deps/junit-4.7.jar b/deps/junit-4.7.jar → test/lib/deps/junit-4.7.jar
diff --git a/test/java/AnytableTest.java → test/src/java/AnytableTest.java b/test/java/AnytableTest.java → test/src/java/AnytableTest.java
@@ -21,7 +21,7 @@ public void testReadRows() throws IOException {
     Anytable at = null;
     String[][] valuesRead = new String[3][3];
     try {
-      at = anytable("test-input/breeds.tab").openReader();
+      at = anytable("sample-data/breeds.tab").openReader();
       int rowNum = 0;
       for (IPersistentVector row : at.rows()) {
         valuesRead[rowNum][0] = (String)row.nth(0);
@@ -43,7 +43,7 @@ public void testReadRecords() throws IOException {
     Anytable at = null;
     String[][] valuesRead = new String[3][3];
     try {
-      at = anytable("test-input/breeds.tab").openReader();
+      at = anytable("sample-data/breeds.tab").openReader();
       int rowNum = 0;
       for (IPersistentMap rec : at.records()) {
         valuesRead[rowNum][0] = (String)rec.valAt("breed");