Author: sslavic
Date: Fri Aug 30 23:16:35 2013
New Revision: 1519115
URL: http://svn.apache.org/r1519115
Log:
Deleted redundant MahoutTestCase base class from integration module and
replaced it with equivalent from core module; by it's javadoc it was added as a
workaround for build issue which is not present anymore
Removed:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/MahoutTestCase.java
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/Bump125Test.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/BloomTokenFilterTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFTypeTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/DriverTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModelTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/text/AbstractLuceneStorageTest.java
Fri Aug 30 23:16:35 2013
@@ -17,6 +17,7 @@
package org.apache.mahout.text;
import com.google.common.collect.Lists;
+
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -25,11 +26,11 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.text.doc.MultipleFieldsDocument;
import org.apache.mahout.text.doc.NumericFieldDocument;
import org.apache.mahout.text.doc.SingleFieldDocument;
-import org.apache.mahout.utils.MahoutTestCase;
import java.io.File;
import java.io.IOException;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/text/MailArchivesClusteringAnalyzerTest.java
Fri Aug 30 23:16:35 2013
@@ -22,9 +22,8 @@ import java.io.StringReader;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
/**
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
Fri Aug 30 23:16:35 2013
@@ -21,14 +21,15 @@ import java.io.FileOutputStream;
import java.util.zip.GZIPOutputStream;
import com.google.common.io.Closeables;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileIterator;
-import org.apache.mahout.utils.MahoutTestCase;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
Fri Aug 30 23:16:35 2013
@@ -25,6 +25,7 @@ import java.util.Map;
import com.google.common.base.Charsets;
import com.google.common.collect.Maps;
import com.google.common.io.Closeables;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -32,9 +33,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.io.Text;
import org.apache.mahout.common.HadoopUtil;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileIterator;
-import org.apache.mahout.utils.MahoutTestCase;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/Bump125Test.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/Bump125Test.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/Bump125Test.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/Bump125Test.java
Fri Aug 30 23:16:35 2013
@@ -18,6 +18,8 @@
package org.apache.mahout.utils;
import com.google.common.collect.Lists;
+
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
import java.util.Iterator;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
Fri Aug 30 23:16:35 2013
@@ -25,6 +25,7 @@ import java.nio.charset.Charset;
import com.google.common.base.Charsets;
import com.google.common.io.Closeables;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -35,6 +36,7 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.classifier.ClassifierData;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileIterable;
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterable;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/BloomTokenFilterTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/BloomTokenFilterTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/BloomTokenFilterTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/nlp/collocations/llr/BloomTokenFilterTest.java
Fri Aug 30 23:16:35 2013
@@ -27,6 +27,7 @@ import java.nio.CharBuffer;
import java.nio.charset.CharsetEncoder;
import com.google.common.base.Charsets;
+
import org.apache.hadoop.util.bloom.BloomFilter;
import org.apache.hadoop.util.bloom.Filter;
import org.apache.hadoop.util.bloom.Key;
@@ -37,7 +38,7 @@ import org.apache.lucene.analysis.core.W
import org.apache.lucene.analysis.shingle.ShingleFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.Version;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class BloomTokenFilterTest extends MahoutTestCase {
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
Fri Aug 30 23:16:35 2013
@@ -18,9 +18,10 @@
package org.apache.mahout.utils.vectors;
import com.google.common.collect.Iterables;
+
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.SequentialAccessSparseVector;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.utils.MahoutTestCase;
import org.junit.Test;
public final class VectorHelperTest extends MahoutTestCase {
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFTypeTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFTypeTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFTypeTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFTypeTest.java
Fri Aug 30 23:16:35 2013
@@ -16,7 +16,7 @@
package org.apache.mahout.utils.vectors.arff;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
public final class ARFFTypeTest extends MahoutTestCase {
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
Fri Aug 30 23:16:35 2013
@@ -27,10 +27,11 @@ import java.util.Map;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
+
+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 final class ARFFVectorIterableTest extends MahoutTestCase {
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/DriverTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/DriverTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/DriverTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/DriverTest.java
Fri Aug 30 23:16:35 2013
@@ -20,7 +20,8 @@ import java.io.StringWriter;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
-import org.apache.mahout.utils.MahoutTestCase;
+
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
/**
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModelTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModelTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModelTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModelTest.java
Fri Aug 30 23:16:35 2013
@@ -16,7 +16,7 @@
package org.apache.mahout.utils.vectors.arff;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
import java.util.Map;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
Fri Aug 30 23:16:35 2013
@@ -23,8 +23,9 @@ import java.io.StringWriter;
import java.util.Iterator;
import com.google.common.io.Closeables;
+
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.utils.MahoutTestCase;
import org.apache.mahout.utils.vectors.RandomVectorIterable;
import org.apache.mahout.utils.vectors.VectorHelper;
import org.apache.mahout.utils.vectors.io.TextualVectorWriter;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
Fri Aug 30 23:16:35 2013
@@ -22,16 +22,17 @@ import java.util.Collection;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
+
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.HadoopUtil;
+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;
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
Fri Aug 30 23:16:35 2013
@@ -4,6 +4,7 @@ package org.apache.mahout.utils.vectors.
import java.io.IOException;
import com.google.common.io.Closeables;
+
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -14,7 +15,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Version;
-import org.apache.mahout.utils.MahoutTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
/**
Modified:
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=1519115&r1=1519114&r2=1519115&view=diff
==============================================================================
---
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
(original)
+++
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
Fri Aug 30 23:16:35 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Iterator;
import com.google.common.io.Closeables;
+
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -31,9 +32,9 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
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.TermInfo;
import org.apache.mahout.vectorizer.TFIDF;
import org.apache.mahout.vectorizer.Weight;
