Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 94903 invoked from network); 5 Nov 2009 01:56:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Nov 2009 01:56:13 -0000 Received: (qmail 9719 invoked by uid 500); 5 Nov 2009 01:56:13 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 9664 invoked by uid 500); 5 Nov 2009 01:56:13 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 9655 invoked by uid 99); 5 Nov 2009 01:56:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 01:56:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 01:56:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 73F7123889DE; Thu, 5 Nov 2009 01:55:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832972 [3/3] - in /lucene/java/trunk/src/test/org/apache/lucene: ./ analysis/ index/ queryParser/ search/ search/function/ search/payloads/ search/spans/ store/ util/ Date: Thu, 05 Nov 2009 01:55:44 -0000 To: java-commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091105015547.73F7123889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Thu Nov 5 01:55:39 2009 @@ -49,6 +49,7 @@ protected IndexSearcher searcher; + @Override public void setUp() throws Exception { super.setUp(); RAMDirectory directory = new RAMDirectory(); @@ -114,6 +115,7 @@ searcher = new IndexSearcher(directory, true); } + @Override public void tearDown() throws Exception { super.tearDown(); searcher.close(); @@ -140,6 +142,7 @@ // mask an anon SpanQuery class that rewrites to something else. SpanQuery q = new FieldMaskingSpanQuery (new SpanTermQuery(new Term("last", "sally")) { + @Override public Query rewrite(IndexReader reader) { return new SpanOrQuery(new SpanQuery[] { new SpanTermQuery(new Term("first", "sally")), Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Thu Nov 5 01:55:39 2009 @@ -39,11 +39,13 @@ public static final QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, FIELD, new WhitespaceAnalyzer()); + @Override public void tearDown() throws Exception { super.tearDown(); searcher.close(); } + @Override public void setUp() throws Exception { super.setUp(); RAMDirectory directory = new RAMDirectory(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Thu Nov 5 01:55:39 2009 @@ -59,6 +59,7 @@ super(s); } + @Override protected void setUp() throws Exception { super.setUp(); PayloadHelper helper = new PayloadHelper(); @@ -472,6 +473,7 @@ class PayloadAnalyzer extends Analyzer { + @Override public TokenStream tokenStream(String fieldName, Reader reader) { TokenStream result = new LowerCaseTokenizer(reader); result = new PayloadFilter(result, fieldName); @@ -502,6 +504,7 @@ payloadAtt = addAttribute(PayloadAttribute.class); } + @Override public boolean incrementToken() throws IOException { if (input.incrementToken()) { String token = new String(termAtt.termBuffer(), 0, termAtt.termLength()); @@ -522,6 +525,7 @@ public class TestPayloadAnalyzer extends Analyzer { + @Override public TokenStream tokenStream(String fieldName, Reader reader) { TokenStream result = new LowerCaseTokenizer(reader); result = new PayloadFilter(result, fieldName); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java Thu Nov 5 01:55:39 2009 @@ -33,6 +33,7 @@ * * @see CheckHits#checkNoMatchExplanations */ + @Override public void qtest(Query q, int[] expDocNrs) throws Exception { CheckHits.checkNoMatchExplanations(q, FIELD, searcher, expDocNrs); } Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java Thu Nov 5 01:55:39 2009 @@ -46,6 +46,7 @@ public static final String field = "field"; + @Override public void setUp() throws Exception { super.setUp(); RAMDirectory directory = new RAMDirectory(); @@ -393,6 +394,7 @@ int slop = 1; final Similarity sim = new DefaultSimilarity() { + @Override public float sloppyFreq(int distance) { return 0.0f; } @@ -404,6 +406,7 @@ makeSpanTermQuery("t2") }, slop, ordered) { + @Override public Similarity getSimilarity(Searcher s) { return sim; } Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Thu Nov 5 01:55:39 2009 @@ -49,6 +49,7 @@ /** * Initializes the tests by adding 4 identical documents to the index. */ + @Override protected void setUp() throws Exception { super.setUp(); super.setUp(); @@ -64,6 +65,7 @@ searcher = new IndexSearcher(mDirectory, true); } + @Override protected void tearDown() throws Exception { super.tearDown(); searcher.close(); Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Thu Nov 5 01:55:39 2009 @@ -35,6 +35,7 @@ /** * Initializes the tests by adding documents to the index. */ + @Override protected void setUp() throws Exception { super.setUp(); @@ -99,6 +100,7 @@ * * @throws IOException */ + @Override public void testBooleanQueryWithSpanQueries() throws IOException { doTestBooleanQueryWithSpanQueries(searcher2, 0.73500174f); Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java Thu Nov 5 01:55:39 2009 @@ -77,6 +77,7 @@ preventDoubleWrite = value; } + @Override public synchronized void sync(String name) throws IOException { maybeThrowDeterministicException(); if (crashed) @@ -170,6 +171,7 @@ } } + @Override public synchronized void deleteFile(String name) throws IOException { deleteFile(name, false); } @@ -191,6 +193,7 @@ super.deleteFile(name); } + @Override public synchronized IndexOutput createOutput(String name) throws IOException { if (crashed) throw new IOException("cannot createOutput after crash"); @@ -220,6 +223,7 @@ return new MockRAMOutputStream(this, file, name); } + @Override public synchronized IndexInput openInput(String name) throws IOException { RAMFile file = fileMap.get(name); if (file == null) @@ -258,6 +262,7 @@ return size; } + @Override public synchronized void close() { if (openFiles == null) { openFiles = new HashMap(); Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java Thu Nov 5 01:55:39 2009 @@ -37,6 +37,7 @@ this.dir = dir; } + @Override public void close() { super.close(); // Pending resolution on LUCENE-686 we may want to @@ -58,6 +59,7 @@ } } + @Override public Object clone() { MockRAMInputStream clone = (MockRAMInputStream) super.clone(); clone.isClone = true; Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java Thu Nov 5 01:55:39 2009 @@ -40,6 +40,7 @@ this.name = name; } + @Override public void close() throws IOException { super.close(); @@ -51,16 +52,19 @@ } } + @Override public void flush() throws IOException { dir.maybeThrowDeterministicException(); super.flush(); } + @Override public void writeByte(byte b) throws IOException { singleByte[0] = b; writeBytes(singleByte, 0, 1); } + @Override public void writeBytes(byte[] b, int offset, int len) throws IOException { long freeSpace = dir.maxSize - dir.sizeInBytes(); long realUsage = 0; Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=832972&r1=832971&r2=832972&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Thu Nov 5 01:55:39 2009 @@ -176,31 +176,31 @@ // reads up to the EOF will succeed. The EOF is determined by the // BufferedIndexInput's arbitrary length() value. public void testEOF() throws Exception { - MyBufferedIndexInput input = new MyBufferedIndexInput(1024); - // see that we can read all the bytes at one go: - checkReadBytes(input, (int)input.length(), 0); - // go back and see that we can't read more than that, for small and - // large overflows: - int pos = (int)input.length()-10; - input.seek(pos); - checkReadBytes(input, 10, pos); - input.seek(pos); - try { - checkReadBytes(input, 11, pos); + MyBufferedIndexInput input = new MyBufferedIndexInput(1024); + // see that we can read all the bytes at one go: + checkReadBytes(input, (int)input.length(), 0); + // go back and see that we can't read more than that, for small and + // large overflows: + int pos = (int)input.length()-10; + input.seek(pos); + checkReadBytes(input, 10, pos); + input.seek(pos); + try { + checkReadBytes(input, 11, pos); fail("Block read past end of file"); } catch (IOException e) { /* success */ } - input.seek(pos); - try { - checkReadBytes(input, 50, pos); + input.seek(pos); + try { + checkReadBytes(input, 50, pos); fail("Block read past end of file"); } catch (IOException e) { /* success */ } - input.seek(pos); - try { - checkReadBytes(input, 100000, pos); + input.seek(pos); + try { + checkReadBytes(input, 100000, pos); fail("Block read past end of file"); } catch (IOException e) { /* success */ @@ -210,34 +210,38 @@ // byten emulates a file - byten(n) returns the n'th byte in that file. // MyBufferedIndexInput reads this "file". private static byte byten(long n){ - return (byte)(n*n%256); + return (byte)(n*n%256); } private static class MyBufferedIndexInput extends BufferedIndexInput { - private long pos; - private long len; - public MyBufferedIndexInput(long len){ - this.len = len; - this.pos = 0; - } - public MyBufferedIndexInput(){ - // an infinite file - this(Long.MAX_VALUE); - } - protected void readInternal(byte[] b, int offset, int length) throws IOException { - for(int i=offset; i