Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/LLRReducerTest.java
 Fri Sep  3 12:28:34 2010
@@ -30,6 +30,7 @@ import org.apache.hadoop.io.DoubleWritab
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.mahout.math.stats.LogLikelihood;
+import org.apache.mahout.utils.MahoutTestCase;
 import org.apache.mahout.utils.nlp.collocations.llr.LLRReducer.LLCallback;
 import org.easymock.classextension.EasyMock;
 import org.junit.Before;
@@ -37,10 +38,11 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Test the LLRReducer
- *  FIXME: Add negative test cases.
+/**
+ * Test the LLRReducer
+ *  TODO Add negative test cases.
  */
-public class LLRReducerTest {
+public final class LLRReducerTest extends MahoutTestCase {
   
   private static final Logger log =
     LoggerFactory.getLogger(LLRReducerTest.class);
@@ -49,8 +51,10 @@ public class LLRReducerTest {
   private LLCallback ll;
   private LLCallback cl;
   
+  @Override
   @Before
-  public void setUp() {
+  public void setUp() throws Exception {
+    super.setUp();
     context   = EasyMock.createMock(Reducer.Context.class);
     ll        = EasyMock.createMock(LLCallback.class);
     cl        = new LLCallback() {

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/RandomVectorIterable.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/RandomVectorIterable.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/RandomVectorIterable.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/RandomVectorIterable.java
 Fri Sep  3 12:28:34 2010
@@ -27,11 +27,12 @@ import org.apache.mahout.math.RandomAcce
 import org.apache.mahout.math.Vector;
 import org.apache.mahout.math.function.UnaryFunction;
 
-public class RandomVectorIterable implements Iterable<Vector>{
-  
-  private int numItems = 100;
+public final class RandomVectorIterable implements Iterable<Vector> {
+
   public enum VectorType {DENSE, SPARSE}
-  
+
+  private int numItems = 100;
+
   private VectorType type = VectorType.SPARSE;
   
   public RandomVectorIterable() {
@@ -52,7 +53,7 @@ public class RandomVectorIterable implem
   }
   
   private class VectIterator implements Iterator<Vector>{
-    private int count = 0;
+    private int count;
     private final Random random = RandomUtils.getRandom();
     @Override
     public boolean hasNext() {

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
 Fri Sep  3 12:28:34 2010
@@ -17,45 +17,22 @@
 
 package org.apache.mahout.utils.vectors;
 
-import java.io.File;
-
-import junit.framework.Assert;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.SequenceFile;
-import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.math.Vector;
 import org.apache.mahout.math.VectorWritable;
+import org.apache.mahout.utils.MahoutTestCase;
 import org.apache.mahout.utils.vectors.io.SequenceFileVectorWriter;
+import org.junit.Test;
 
-public class SequenceFileVectorIterableTest extends MahoutTestCase {
-  
-  private File tmpLoc;
-  private File tmpFile;
-  
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-    File tmpDir = new File(System.getProperty("java.io.tmpdir"));
-    tmpLoc = new File(tmpDir, "sfvit");
-    tmpLoc.deleteOnExit();
-    tmpLoc.mkdirs();
-    tmpFile = File.createTempFile("sfvit", ".dat", tmpLoc);
-    tmpFile.deleteOnExit();
-  }
-  
-  @Override
-  public void tearDown() throws Exception {
-    tmpFile.delete();
-    tmpLoc.delete();
-    super.tearDown();
-  }
-  
+public final class SequenceFileVectorIterableTest extends MahoutTestCase {
+
+  @Test
   public void testIterable() throws Exception {
-    Path path = new Path(tmpFile.getAbsolutePath());
+    Path path = getTestTempFilePath("sfvit.dat");
     Configuration conf = new Configuration();
     FileSystem fs = FileSystem.get(conf);
     SequenceFile.Writer seqWriter = new SequenceFile.Writer(fs, conf, path, 
LongWritable.class, VectorWritable.class);
@@ -72,6 +49,6 @@ public class SequenceFileVectorIterableT
       count++;
     }
     seqReader.close();
-    Assert.assertEquals(50, count);
+    assertEquals(50, count);
   }
 }

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
 Fri Sep  3 12:28:34 2010
@@ -21,15 +21,15 @@ import java.text.DateFormat;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Assert;
-
-import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.RandomAccessSparseVector;
 import org.apache.mahout.math.Vector;
+import org.apache.mahout.utils.MahoutTestCase;
+import org.junit.Test;
 
-public class ARFFVectorIterableTest extends MahoutTestCase {
-  
+public final class ARFFVectorIterableTest extends MahoutTestCase {
+
+  @Test
   public void testValues() throws Exception {
     StringBuilder builder = new StringBuilder();
     builder.append("%comments").append('\n').append("@RELATION 
Mahout").append('\n')
@@ -44,124 +44,128 @@ public class ARFFVectorIterableTest exte
     .append("{0 5,1 23}").append('\n');
     ARFFModel model = new MapBackedARFFModel();
     ARFFVectorIterable iterable = new ARFFVectorIterable(builder.toString(), 
model);
-    Assert.assertEquals("Mahout", iterable.getModel().getRelation());
+    assertEquals("Mahout", iterable.getModel().getRelation());
     Map<String, Integer> bindings = iterable.getModel().getLabelBindings();
-    Assert.assertNotNull(bindings);
-    Assert.assertEquals(5, bindings.size());
+    assertNotNull(bindings);
+    assertEquals(5, bindings.size());
     Iterator<Vector> iter = iterable.iterator();
-    Assert.assertTrue(iter.hasNext());
+    assertTrue(iter.hasNext());
     Vector next = iter.next();
-    Assert.assertNotNull(next);
-    Assert.assertTrue("Wrong instanceof", next instanceof DenseVector);
-    Assert.assertEquals(1.0, next.get(0));
-    Assert.assertEquals(2.0, next.get(1));
-    Assert.assertTrue(iter.hasNext());
+    assertNotNull(next);
+    assertTrue("Wrong instanceof", next instanceof DenseVector);
+    assertEquals(1.0, next.get(0), EPSILON);
+    assertEquals(2.0, next.get(1), EPSILON);
+    assertTrue(iter.hasNext());
     next = iter.next();
-    Assert.assertNotNull(next);
-    Assert.assertTrue("Wrong instanceof", next instanceof DenseVector);
-    Assert.assertEquals(2.0, next.get(0));
-    Assert.assertEquals(3.0, next.get(1));
+    assertNotNull(next);
+    assertTrue("Wrong instanceof", next instanceof DenseVector);
+    assertEquals(2.0, next.get(0), EPSILON);
+    assertEquals(3.0, next.get(1), EPSILON);
     
-    Assert.assertTrue(iter.hasNext());
+    assertTrue(iter.hasNext());
     next = iter.next();
-    Assert.assertNotNull(next);
-    Assert.assertTrue("Wrong instanceof", next instanceof 
RandomAccessSparseVector);
-    Assert.assertEquals(5.0, next.get(0));
-    Assert.assertEquals(23.0, next.get(1));
+    assertNotNull(next);
+    assertTrue("Wrong instanceof", next instanceof RandomAccessSparseVector);
+    assertEquals(5.0, next.get(0), EPSILON);
+    assertEquals(23.0, next.get(1), EPSILON);
     
-    Assert.assertFalse(iter.hasNext());
+    assertFalse(iter.hasNext());
   }
-  
+
+  @Test
   public void testDense() throws Exception {
     ARFFModel model = new MapBackedARFFModel();
     Iterable<Vector> iterable = new ARFFVectorIterable(SAMPLE_DENSE_ARFF, 
model);
     int count = 0;
     for (Vector vector : iterable) {
-      Assert.assertTrue("Vector is not dense", vector instanceof DenseVector);
+      assertTrue("Vector is not dense", vector instanceof DenseVector);
       count++;
     }
-    Assert.assertEquals(10, count);
+    assertEquals(10, count);
   }
-  
+
+  @Test
   public void testSparse() throws Exception {
     ARFFModel model = new MapBackedARFFModel();
     Iterable<Vector> iterable = new ARFFVectorIterable(SAMPLE_SPARSE_ARFF, 
model);
     int count = 0;
     for (Vector vector : iterable) {
-      Assert.assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
+      assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
       count++;
     }
-    Assert.assertEquals(10, count);
+    assertEquals(10, count);
   }
-  
+
+  @Test
   public void testNonNumeric() throws Exception {
     
     MapBackedARFFModel model = new MapBackedARFFModel();
     ARFFVectorIterable iterable = new ARFFVectorIterable(NON_NUMERIC_ARFF, 
model);
     int count = 0;
     for (Vector vector : iterable) {
-      Assert.assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
+      assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
       count++;
     }
-    Assert.assertEquals(10, count);
+    assertEquals(10, count);
     Map<String, Map<String, Integer>> nominalMap = 
iterable.getModel().getNominalMap();
-    Assert.assertNotNull(nominalMap);
-    Assert.assertEquals(1, nominalMap.size());
+    assertNotNull(nominalMap);
+    assertEquals(1, nominalMap.size());
     Map<String, Integer> noms = nominalMap.get("bar");
-    Assert.assertNotNull("nominals for bar are null", noms);
-    Assert.assertEquals(2, noms.size());
+    assertNotNull("nominals for bar are null", noms);
+    assertEquals(2, noms.size());
     Map<Integer, ARFFType> integerARFFTypeMap = model.getTypeMap();
-    Assert.assertNotNull("Type map null", integerARFFTypeMap);
-    Assert.assertEquals(5, integerARFFTypeMap.size());
+    assertNotNull("Type map null", integerARFFTypeMap);
+    assertEquals(5, integerARFFTypeMap.size());
     Map<String, Long> words = model.getWords();
-    Assert.assertNotNull("words null", words);
-    Assert.assertEquals(10, words.size());
+    assertNotNull("words null", words);
+    assertEquals(10, words.size());
     //System.out.println("Words: " + words);
     Map<Integer, DateFormat> integerDateFormatMap = model.getDateMap();
-    Assert.assertNotNull("date format null", integerDateFormatMap);
-    Assert.assertEquals(1, integerDateFormatMap.size());
+    assertNotNull("date format null", integerDateFormatMap);
+    assertEquals(1, integerDateFormatMap.size());
     
   }
-  
+
+  @Test
   public void testMultipleNoms() throws Exception {
     MapBackedARFFModel model = new MapBackedARFFModel();
     ARFFVectorIterable iterable = new ARFFVectorIterable(NON_NUMERIC_ARFF, 
model);
     int count = 0;
     for (Vector vector : iterable) {
-      Assert.assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
+      assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
       count++;
     }
-    Assert.assertEquals(10, count);
+    assertEquals(10, count);
     Map<String, Map<String, Integer>> nominalMap = 
iterable.getModel().getNominalMap();
-    Assert.assertNotNull(nominalMap);
-    Assert.assertEquals(1, nominalMap.size());
+    assertNotNull(nominalMap);
+    assertEquals(1, nominalMap.size());
     Map<String, Integer> noms = nominalMap.get("bar");
-    Assert.assertNotNull("nominals for bar are null", noms);
-    Assert.assertEquals(2, noms.size());
+    assertNotNull("nominals for bar are null", noms);
+    assertEquals(2, noms.size());
     Map<Integer, ARFFType> integerARFFTypeMap = model.getTypeMap();
-    Assert.assertNotNull("Type map null", integerARFFTypeMap);
-    Assert.assertEquals(5, integerARFFTypeMap.size());
+    assertNotNull("Type map null", integerARFFTypeMap);
+    assertEquals(5, integerARFFTypeMap.size());
     Map<String, Long> words = model.getWords();
-    Assert.assertNotNull("words null", words);
-    Assert.assertEquals(10, words.size());
+    assertNotNull("words null", words);
+    assertEquals(10, words.size());
     //System.out.println("Words: " + words);
     Map<Integer, DateFormat> integerDateFormatMap = model.getDateMap();
-    Assert.assertNotNull("date format null", integerDateFormatMap);
-    Assert.assertEquals(1, integerDateFormatMap.size());
+    assertNotNull("date format null", integerDateFormatMap);
+    assertEquals(1, integerDateFormatMap.size());
     model = new MapBackedARFFModel(model.getWords(), model.getWordCount(),
       model.getNominalMap());
     iterable = new ARFFVectorIterable(NON_NUMERIC_ARFF2, model);
     count = 0;
     for (Vector vector : iterable) {
-      Assert.assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
+      assertTrue("Vector is not dense", vector instanceof 
RandomAccessSparseVector);
       count++;
     }
     nominalMap = model.getNominalMap();
-    Assert.assertNotNull(nominalMap);
-    Assert.assertEquals(2, nominalMap.size());
+    assertNotNull(nominalMap);
+    assertEquals(2, nominalMap.size());
     noms = nominalMap.get("test");
-    Assert.assertNotNull("nominals for bar are null", noms);
-    Assert.assertEquals(2, noms.size());
+    assertNotNull("nominals for bar are null", noms);
+    assertEquals(2, noms.size());
   }
   
   

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
 Fri Sep  3 12:28:34 2010
@@ -21,22 +21,22 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Writable;
-import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.Vector;
 import org.apache.mahout.math.VectorWritable;
+import org.apache.mahout.utils.MahoutTestCase;
 import org.apache.mahout.utils.vectors.RandomVectorIterable;
+import org.junit.Test;
 
-public class VectorWriterTest extends MahoutTestCase {
+public final class VectorWriterTest extends MahoutTestCase {
 
+  @Test
   public void testSFVW() throws Exception {
     Path path = getTestTempFilePath("sfvw");
     Configuration conf = new Configuration();
@@ -54,9 +54,10 @@ public class VectorWriterTest extends Ma
     while (seqReader.next(key, value)){
       count++;
     }
-    Assert.assertEquals(count + " does not equal: " + 50, 50, count);
+    assertEquals(count + " does not equal: " + 50, 50, count);
   }
-  
+
+  @Test
   public void test() throws Exception {
     StringWriter strWriter = new StringWriter();
     VectorWriter writer = new JWriterVectorWriter(strWriter);
@@ -66,8 +67,8 @@ public class VectorWriterTest extends Ma
     writer.write(vectors);
     writer.close();
     String buffer = strWriter.toString();
-    Assert.assertNotNull(buffer);
-    Assert.assertTrue(buffer.length() > 0);
+    assertNotNull(buffer);
+    assertTrue(buffer.length() > 0);
     
   }
 }

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
 Fri Sep  3 12:28:34 2010
@@ -17,25 +17,24 @@
 
 package org.apache.mahout.utils.vectors.lucene;
 
-import junit.framework.Assert;
-
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.Version;
-import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.math.NamedVector;
 import org.apache.mahout.math.Vector;
+import org.apache.mahout.utils.MahoutTestCase;
 import org.apache.mahout.utils.vectors.TFIDF;
 import org.apache.mahout.utils.vectors.TermInfo;
 import org.apache.mahout.utils.vectors.Weight;
+import org.junit.Test;
+
+public final class LuceneIterableTest extends MahoutTestCase {
 
-public class LuceneIterableTest extends MahoutTestCase {
-  private RAMDirectory directory;
-  
   private static final String [] DOCS = {
                                          "The quick red fox jumped over the 
lazy brown dogs.",
                                          "Mary had a little lamb whose fleece 
was white as snow.",
@@ -43,25 +42,31 @@ public class LuceneIterableTest extends 
                                          "The robber wore a black fleece 
jacket and a baseball cap.",
                                          "The English Springer Spaniel is the 
best of all dogs."
   };
-  
+
+  private RAMDirectory directory;
   
   @Override
-  protected void setUp() throws Exception {
+  public void setUp() throws Exception {
     super.setUp();
     directory = new RAMDirectory();
-    IndexWriter writer = new IndexWriter(directory, new 
StandardAnalyzer(Version.LUCENE_CURRENT), true, 
IndexWriter.MaxFieldLength.UNLIMITED);
+    IndexWriter writer = new IndexWriter(
+        directory,
+        new StandardAnalyzer(Version.LUCENE_CURRENT),
+        true,
+        IndexWriter.MaxFieldLength.UNLIMITED);
     for (int i = 0; i < LuceneIterableTest.DOCS.length; i++){
       Document doc = new Document();
-      Field id = new Field("id", "doc_" + i, Field.Store.YES, 
Field.Index.NOT_ANALYZED_NO_NORMS);
+      Fieldable id = new Field("id", "doc_" + i, Field.Store.YES, 
Field.Index.NOT_ANALYZED_NO_NORMS);
       doc.add(id);
       //Store both position and offset information
-      Field text = new Field("content", DOCS[i], Field.Store.NO, 
Field.Index.ANALYZED, Field.TermVector.YES);
+      Fieldable text = new Field("content", DOCS[i], Field.Store.NO, 
Field.Index.ANALYZED, Field.TermVector.YES);
       doc.add(text);
       writer.addDocument(doc);
     }
     writer.close();
   }
-  
+
+  @Test
   public void testIterable() throws Exception {
     IndexReader reader = IndexReader.open(directory, true);
     Weight weight = new TFIDF();
@@ -71,9 +76,9 @@ public class LuceneIterableTest extends 
 
     //TODO: do something more meaningful here
     for (Vector vector : iterable) {
-      Assert.assertNotNull(vector);
-      Assert.assertTrue("vector is not an instanceof " + NamedVector.class, 
vector instanceof NamedVector);
-      Assert.assertTrue("vector Size: " + vector.size() + " is not greater 
than: " + 0, vector.size() > 0);
+      assertNotNull(vector);
+      assertTrue("vector is not an instanceof " + NamedVector.class, vector 
instanceof NamedVector);
+      assertTrue("vector Size: " + vector.size() + " is not greater than: " + 
0, vector.size() > 0);
       assertTrue(((NamedVector)vector).getName().startsWith("doc_"));
     }
 
@@ -81,9 +86,9 @@ public class LuceneIterableTest extends 
 
     //TODO: do something more meaningful here
     for (Vector vector : iterable) {
-      Assert.assertNotNull(vector);
-      Assert.assertTrue("vector is not an instanceof " + NamedVector.class, 
vector instanceof NamedVector);
-      Assert.assertTrue("vector Size: " + vector.size() + " is not greater 
than: " + 0, vector.size() > 0);
+      assertNotNull(vector);
+      assertTrue("vector is not an instanceof " + NamedVector.class, vector 
instanceof NamedVector);
+      assertTrue("vector Size: " + vector.size() + " is not greater than: " + 
0, vector.size() > 0);
       assertTrue(((NamedVector)vector).getName().startsWith("doc_"));
     }
 

Modified: 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java?rev=992277&r1=992276&r2=992277&view=diff
==============================================================================
--- 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
 (original)
+++ 
mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
 Fri Sep  3 12:28:34 2010
@@ -17,7 +17,6 @@
 
 package org.apache.mahout.utils.vectors.text;
 
-import java.io.IOException;
 import java.util.Random;
 
 import org.apache.hadoop.conf.Configuration;
@@ -26,30 +25,25 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Text;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.mahout.common.MahoutTestCase;
 import org.apache.mahout.common.RandomUtils;
 import org.apache.mahout.text.DefaultAnalyzer;
+import org.apache.mahout.utils.MahoutTestCase;
 import org.apache.mahout.utils.vectors.tfidf.TFIDFConverter;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Test the dictionary Vector
  */
-public class DictionaryVectorizerTest extends MahoutTestCase {
+public final class DictionaryVectorizerTest extends MahoutTestCase {
 
   private static final int AVG_DOCUMENT_LENGTH = 20;
-
   private static final int AVG_SENTENCE_LENGTH = 8;
-
   private static final int AVG_WORD_LENGTH = 6;
-
   private static final int NUM_DOCS = 100;
-
   private static final String CHARSET = "abcdef";
-
   private static final String DELIM = " .,?;:!\t\n\r";
-
   private static final String ERRORSET = "`1234567890" + 
"-...@#$%^&*()_+[]{}'\"/<>|\\";
-
   private static final Random random = RandomUtils.getRandom();
 
   private FileSystem fs;
@@ -81,24 +75,26 @@ public class DictionaryVectorizerTest ex
     int length = (AVG_WORD_LENGTH >> 1) + 
DictionaryVectorizerTest.random.nextInt(AVG_WORD_LENGTH);
     StringBuilder sb = new StringBuilder(length);
     for (int i = 0; i < length; i++) {
-      
sb.append(DictionaryVectorizerTest.CHARSET.charAt(DictionaryVectorizerTest.random.nextInt(DictionaryVectorizerTest.CHARSET
-          .length())));
+      sb.append(DictionaryVectorizerTest.CHARSET.charAt(
+          
DictionaryVectorizerTest.random.nextInt(DictionaryVectorizerTest.CHARSET.length())));
     }
     if (DictionaryVectorizerTest.random.nextInt(10) == 0) {
-      
sb.append(DictionaryVectorizerTest.ERRORSET.charAt(DictionaryVectorizerTest.random.nextInt(DictionaryVectorizerTest.ERRORSET
-          .length())));
+      sb.append(DictionaryVectorizerTest.ERRORSET.charAt(
+          
DictionaryVectorizerTest.random.nextInt(DictionaryVectorizerTest.ERRORSET.length())));
     }
     return sb.toString();
   }
 
   @Override
+  @Before
   public void setUp() throws Exception {
     super.setUp();
     Configuration conf = new Configuration();
     fs = FileSystem.get(conf);
   }
 
-  public void testCreateTermFrequencyVectors() throws IOException, 
InterruptedException, ClassNotFoundException {
+  @Test
+  public void testCreateTermFrequencyVectors() throws Exception {
     Configuration conf = new Configuration();
     Path path = getTestTempFilePath("documents/docs.file");
     SequenceFile.Writer writer = new SequenceFile.Writer(fs, conf, path, 
Text.class, Text.class);


Reply via email to