You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/04/19 12:02:59 UTC

svn commit: r1094986 [2/2] - in /uima/sandbox/trunk/Lucas: ./ src/docbook/ src/main/java/org/apache/uima/lucas/ src/main/java/org/apache/uima/lucas/indexer/ src/main/java/org/apache/uima/lucas/indexer/analysis/ src/main/java/org/apache/uima/lucas/index...

Modified: uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UniqueFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UniqueFilterFactoryTest.java?rev=1094986&r1=1094985&r2=1094986&view=diff
==============================================================================
--- uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UniqueFilterFactoryTest.java (original)
+++ uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UniqueFilterFactoryTest.java Tue Apr 19 10:02:58 2011
@@ -19,13 +19,13 @@
 
 package org.apache.uima.lucas.indexer.analysis;
 
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.junit.Assert.*;
-
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.uima.lucas.indexer.test.util.DummyTokenStream;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+
 public class UniqueFilterFactoryTest {
 
 	private TokenStream tokenStream;
@@ -33,7 +33,7 @@ public class UniqueFilterFactoryTest {
 	
 	@Before
 	public void setUp(){
-		tokenStream = createMock(TokenStream.class);
+		tokenStream = new DummyTokenStream("dummy", 1, 1, 0);
 		uniqueFilterFactory = new UniqueFilterFactory();
 	}
 	

Modified: uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UppercaseFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UppercaseFilterFactoryTest.java?rev=1094986&r1=1094985&r2=1094986&view=diff
==============================================================================
--- uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UppercaseFilterFactoryTest.java (original)
+++ uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/analysis/UppercaseFilterFactoryTest.java Tue Apr 19 10:02:58 2011
@@ -19,13 +19,13 @@
 
 package org.apache.uima.lucas.indexer.analysis;
 
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.junit.Assert.assertNotNull;
-
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.uima.lucas.indexer.test.util.DummyTokenStream;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+
 public class UppercaseFilterFactoryTest {
 	
 	private TokenStream tokenStream;
@@ -33,7 +33,7 @@ public class UppercaseFilterFactoryTest 
 	
 	@Before
 	public void setUp(){
-		tokenStream = createMock(TokenStream.class);
+		tokenStream = new DummyTokenStream("dummy", 1, 1, 0);
 		upperCaseFilterFactory = new UpperCaseFilterFactory();
 	}
 	@Test

Modified: uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/test/util/DummyTokenStream.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/test/util/DummyTokenStream.java?rev=1094986&r1=1094985&r2=1094986&view=diff
==============================================================================
--- uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/test/util/DummyTokenStream.java (original)
+++ uima/sandbox/trunk/Lucas/src/test/java/org/apache/uima/lucas/indexer/test/util/DummyTokenStream.java Tue Apr 19 10:02:58 2011
@@ -19,11 +19,11 @@
 
 package org.apache.uima.lucas.indexer.test.util;
 
-import java.io.IOException;
-
-import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.uima.lucas.indexer.util.TokenFactory;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+
+import java.io.IOException;
 
 public class DummyTokenStream extends TokenStream{
 	private int count = 0;
@@ -32,13 +32,18 @@ public class DummyTokenStream extends To
 	private int number;
 	private int begin;
 	private int end;
+	private int offset;
+	private boolean firstToken = true;
+	private OffsetAttribute offsetAtt;
+	private TermAttribute termAtt;
 	
 	
 	public DummyTokenStream(String tokenValue, int distance, int number, int offset) {
 		this.tokenValue = tokenValue;
 		this.distance = distance;
 		this.number = number;
-	
+		this.offset = offset;
+		
 		
 		if( offset > 0 ){
 			count = offset;
@@ -48,20 +53,38 @@ public class DummyTokenStream extends To
 		else{
 			begin = 0; 
 			end = tokenValue.length();
-		}			
+		}
+		// set initial attributes
+		offsetAtt = (OffsetAttribute)addAttribute(OffsetAttribute.class);
+		offsetAtt.setOffset(begin, end);
+		termAtt = (TermAttribute)addAttribute(TermAttribute.class);
+		termAtt.setTermBuffer(tokenValue);
 	}
 	
-	public Token next() throws IOException {
+	
+	
+	@Override
+	public boolean incrementToken() throws IOException {
 		if( number <= count / distance )
-			return null;
-										
-		Token token = TokenFactory.newToken(tokenValue, begin, end);			
-
+			return false;
+		// for the first token just return the initial values
+		if (firstToken) {
+			firstToken = false;
+			return true;
+		}
+		
 		count += distance;
+		
 		begin+= distance* (tokenValue.length() + 1);
 		end+= distance* (tokenValue.length() + 1);
-		
-		System.out.println(token);
-		return token;
-	}		
+		offsetAtt.setOffset(begin, end);
+
+		return begin < (offset * (tokenValue.length() + 1) + (number - 1) * distance * (tokenValue.length() + 1) + tokenValue.length());
+	}
+
+	
+	public String toString() {
+		return "tokenValue: " + tokenValue + ", distance: " + distance + ", number: " + number + ", offset: " + offset;
+	}
+	
 }
\ No newline at end of file