jvanzyl 01/09/18 10:35:58
Modified: . build.properties build.xml
src/test/org/apache/lucene AnalysisTest.java
HighFreqTerms.java IndexTest.java SearchTest.java
SearchTestForDuplicates.java StoreTest.java
ThreadSafetyTest.java
src/test/org/apache/lucene/index DocTest.java
src/test/org/apache/lucene/queryParser TestQueryParser.java
Log:
- import fixes in the test src tree
- the test target appears to depend on classes in the demo src
tree so i added the dep to the test target. test target
still isn't working but getting there.
Revision Changes Path
1.4 +5 -6 jakarta-lucene/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-lucene/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 2001/09/18 17:21:38 1.3
+++ build.properties 2001/09/18 17:35:57 1.4
@@ -13,11 +13,10 @@
docs.dest = ./docs
src.dir = ./src/java
-demo.dir = ./src/demo
demo.src = ./src/demo
+test.src = ./src/test
docs.dir = ./doc
lib.dir = ./lib
-test.dir = ./src/test
dist.dir=${final.name}
# javadoc packages
@@ -30,12 +29,12 @@
build.src = ${build.dir}/src
build.demo = ${build.dir}/demo
-build.src.demo = ${build.demo}/src
-build.classes.demo = ${build.demo}/classes
+build.demo.src = ${build.demo}/src
+build.demo.classes = ${build.demo}/classes
build.test = ${build.dir}/test
-build.src.test = ${build.test}/src
-build.classes.test = ${build.test}/classes
+build.test.src = ${build.test}/src
+build.test.classes = ${build.test}/classes
junit.src = ${basedir}/test/unit
junit.classes = ${build.dir}/unit-classes
1.5 +20 -10 jakarta-lucene/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-lucene/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/09/18 17:21:38 1.4
+++ build.xml 2001/09/18 17:35:57 1.5
@@ -9,6 +9,7 @@
<path id="classpath">
<pathelement location="${build.classes}"/>
<pathelement location="${build.demo.classes}"/>
+ <pathelement location="${build.test.classes}"/>
<pathelement location="."/>
<fileset dir="lib">
<include name="*.jar" />
@@ -121,7 +122,7 @@
<target name="demo" depends="compile" if="javacc.present">
<mkdir dir="${build.demo}"/>
- <copy todir="${build.demo}/src">
+ <copy todir="${build.demo.src}">
<fileset dir="${demo.src}">
<include name="**/*.java"/>
<include name="**/*.jj"/>
@@ -129,17 +130,17 @@
</copy>
<javacc
- target="${build.src.demo}/org/apache/lucene/HTMLParser/HTMLParser.jj"
+ target="${build.demo.src}/org/apache/lucene/HTMLParser/HTMLParser.jj"
javacchome="${javacc.zip.dir}"
- outputdirectory="${build.src.demo}/org/apache/lucene/HTMLParser"
+ outputdirectory="${build.demo.src}/org/apache/lucene/HTMLParser"
/>
- <mkdir dir="${build.classes.demo}"/>
+ <mkdir dir="${build.demo.classes}"/>
<javac
- srcdir="${build.src.demo}"
+ srcdir="${build.demo.src}"
includes="**/*.java"
- destdir="${build.classes.demo}"
+ destdir="${build.demo.classes}"
debug="${debug}">
<classpath refid="classpath"/>
</javac>
@@ -150,12 +151,21 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="test" depends="compile">
+ <target name="test" depends="compile,demo">
<mkdir dir="${build.test}"/>
+
+ <copy todir="${build.test.src}">
+ <fileset dir="${test.src}">
+ <include name="**/*.java"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.test.classes}"/>
+
<javac
- srcdir="${build.src}"
- includes="${test.dir}/**"
- destdir="${build.test}"
+ srcdir="${build.test.src}"
+ includes="**/*.java"
+ destdir="${build.test.classes}"
debug="${debug}">
<classpath refid="classpath"/>
</javac>
1.2 +4 -4 jakarta-lucene/src/test/org/apache/lucene/AnalysisTest.java
Index: AnalysisTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/AnalysisTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnalysisTest.java 2001/09/18 16:30:00 1.1
+++ AnalysisTest.java 2001/09/18 17:35:57 1.2
@@ -54,10 +54,10 @@
* <http://www.apache.org/>.
*/
-import com.lucene.analysis.SimpleAnalyzer;
-import com.lucene.analysis.Analyzer;
-import com.lucene.analysis.TokenStream;
-import com.lucene.analysis.Token;
+import org.apache.lucene.analysis.SimpleAnalyzer;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.Token;
import java.io.Reader;
import java.io.StringReader;
1.2 +6 -6 jakarta-lucene/src/test/org/apache/lucene/HighFreqTerms.java
Index: HighFreqTerms.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/HighFreqTerms.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HighFreqTerms.java 2001/09/18 16:30:00 1.1
+++ HighFreqTerms.java 2001/09/18 17:35:57 1.2
@@ -54,12 +54,12 @@
* <http://www.apache.org/>.
*/
-import com.lucene.util.PriorityQueue;
-import com.lucene.store.Directory;
-import com.lucene.store.FSDirectory;
-import com.lucene.index.IndexReader;
-import com.lucene.index.Term;
-import com.lucene.index.TermEnum;
+import org.apache.lucene.util.PriorityQueue;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermEnum;
class HighFreqTerms {
public static int numTerms = 100;
1.2 +5 -5 jakarta-lucene/src/test/org/apache/lucene/IndexTest.java
Index: IndexTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/IndexTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IndexTest.java 2001/09/18 16:30:00 1.1
+++ IndexTest.java 2001/09/18 17:35:57 1.2
@@ -54,11 +54,11 @@
* <http://www.apache.org/>.
*/
-import com.lucene.analysis.SimpleAnalyzer;
-import com.lucene.index.IndexWriter;
-import com.lucene.index.TermPositions;
-import com.lucene.document.Document;
-import demo.FileDocument;
+import org.apache.lucene.analysis.SimpleAnalyzer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.TermPositions;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.FileDocument;
import java.io.File;
import java.util.Date;
1.2 +6 -6 jakarta-lucene/src/test/org/apache/lucene/SearchTest.java
Index: SearchTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/SearchTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchTest.java 2001/09/18 16:30:00 1.1
+++ SearchTest.java 2001/09/18 17:35:57 1.2
@@ -58,12 +58,12 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import com.lucene.store.*;
-import com.lucene.document.*;
-import com.lucene.analysis.*;
-import com.lucene.index.*;
-import com.lucene.search.*;
-import com.lucene.queryParser.*;
+import org.apache.lucene.store.*;
+import org.apache.lucene.document.*;
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.index.*;
+import org.apache.lucene.search.*;
+import org.apache.lucene.queryParser.*;
class SearchTest {
public static void main(String[] args) {
1.2 +6 -6
jakarta-lucene/src/test/org/apache/lucene/SearchTestForDuplicates.java
Index: SearchTestForDuplicates.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/test/org/apache/lucene/SearchTestForDuplicates.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchTestForDuplicates.java 2001/09/18 16:30:00 1.1
+++ SearchTestForDuplicates.java 2001/09/18 17:35:57 1.2
@@ -58,12 +58,12 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import com.lucene.store.*;
-import com.lucene.document.*;
-import com.lucene.analysis.*;
-import com.lucene.index.*;
-import com.lucene.search.*;
-import com.lucene.queryParser.*;
+import org.apache.lucene.store.*;
+import org.apache.lucene.document.*;
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.index.*;
+import org.apache.lucene.search.*;
+import org.apache.lucene.queryParser.*;
class SearchTestForDuplicates {
1.2 +5 -5 jakarta-lucene/src/test/org/apache/lucene/StoreTest.java
Index: StoreTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/StoreTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StoreTest.java 2001/09/18 16:30:00 1.1
+++ StoreTest.java 2001/09/18 17:35:57 1.2
@@ -54,11 +54,11 @@
* <http://www.apache.org/>.
*/
-import com.lucene.store.Directory;
-import com.lucene.store.InputStream;
-import com.lucene.store.OutputStream;
-import com.lucene.store.FSDirectory;
-import com.lucene.store.RAMDirectory;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.InputStream;
+import org.apache.lucene.store.OutputStream;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.RAMDirectory;
import java.util.Date;
import java.util.Random;
1.2 +6 -6 jakarta-lucene/src/test/org/apache/lucene/ThreadSafetyTest.java
Index: ThreadSafetyTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/ThreadSafetyTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadSafetyTest.java 2001/09/18 16:30:01 1.1
+++ ThreadSafetyTest.java 2001/09/18 17:35:57 1.2
@@ -54,12 +54,12 @@
* <http://www.apache.org/>.
*/
-import com.lucene.store.*;
-import com.lucene.document.*;
-import com.lucene.analysis.*;
-import com.lucene.index.*;
-import com.lucene.search.*;
-import com.lucene.queryParser.*;
+import org.apache.lucene.store.*;
+import org.apache.lucene.document.*;
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.index.*;
+import org.apache.lucene.search.*;
+import org.apache.lucene.queryParser.*;
import java.io.File;
import java.util.Random;
1.2 +1 -1 jakarta-lucene/src/test/org/apache/lucene/index/DocTest.java
Index: DocTest.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/test/org/apache/lucene/index/DocTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocTest.java 2001/09/18 16:30:01 1.1
+++ DocTest.java 2001/09/18 17:35:57 1.2
@@ -59,7 +59,7 @@
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.document.Document;
-import demo.FileDocument;
+import org.apache.lucene.FileDocument;
import java.io.File;
import java.util.Date;
1.2 +5 -5
jakarta-lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
Index: TestQueryParser.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestQueryParser.java 2001/09/18 16:30:01 1.1
+++ TestQueryParser.java 2001/09/18 17:35:57 1.2
@@ -57,11 +57,11 @@
import java.io.*;
import junit.framework.*;
-import com.lucene.*;
-import com.lucene.queryParser.*;
-import com.lucene.search.*;
-import com.lucene.analysis.*;
-import com.lucene.analysis.Token;
+import org.apache.lucene.*;
+import org.apache.lucene.queryParser.*;
+import org.apache.lucene.search.*;
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Token;
public class TestQueryParser extends TestCase {
