You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2013/10/27 23:42:42 UTC
svn commit: r1536215 - in /mahout/trunk:
core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/
core/src/test/java/org/apache/mahout/classifier/df/data/
core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/
core/src/test/java/org/apach...
Author: sslavic
Date: Sun Oct 27 22:42:41 2013
New Revision: 1536215
URL: http://svn.apache.org/r1536215
Log:
MAHOUT-1325 Change hadoop dependent tests to work out of a directory that is not under /tmp (isabel via sslavic)
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/DataLoaderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/InMemInputFormatTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/partial/PartialBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDTestsHelper.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/clustering/display/ClustersFilterTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java
mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.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/TestConcatenateVectorsJob.java
mahout/trunk/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.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/DriverTest.java
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/als/ParallelALSFactorizationJobTest.java Sun Oct 27 22:42:41 2013
@@ -60,7 +60,7 @@ public class ParallelALSFactorizationJob
outputDir.delete();
tmpDir = getTestTempDir("tmp");
- conf = new Configuration();
+ conf = getConfiguration();
// reset as we run all tests in the same JVM
SharingMapper.reset();
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/DataLoaderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/DataLoaderTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/DataLoaderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/DataLoaderTest.java Sun Oct 27 22:42:41 2013
@@ -257,7 +257,7 @@ public final class DataLoaderTest extend
Dataset dataset = DataLoader.generateDataset(descriptor, false, sData);
Path dataPath = Utils.writeDataToTestFile(sData);
- FileSystem fs = dataPath.getFileSystem(new Configuration());
+ FileSystem fs = dataPath.getFileSystem(getConfiguration());
Data loaded = DataLoader.loadData(dataset, fs, dataPath);
testLoadedData(source, attrs, missings, loaded);
@@ -269,7 +269,7 @@ public final class DataLoaderTest extend
dataset = DataLoader.generateDataset(descriptor, true, sData);
dataPath = Utils.writeDataToTestFile(sData);
- fs = dataPath.getFileSystem(new Configuration());
+ fs = dataPath.getFileSystem(getConfiguration());
loaded = DataLoader.loadData(dataset, fs, dataPath);
testLoadedData(source, attrs, missings, loaded);
@@ -295,7 +295,7 @@ public final class DataLoaderTest extend
Dataset expected = DataLoader.generateDataset(descriptor, false, sData);
Path path = Utils.writeDataToTestFile(sData);
- FileSystem fs = path.getFileSystem(new Configuration());
+ FileSystem fs = path.getFileSystem(getConfiguration());
Dataset dataset = DataLoader.generateDataset(descriptor, false, fs, path);
@@ -308,7 +308,7 @@ public final class DataLoaderTest extend
expected = DataLoader.generateDataset(descriptor, false, sData);
path = Utils.writeDataToTestFile(sData);
- fs = path.getFileSystem(new Configuration());
+ fs = path.getFileSystem(getConfiguration());
dataset = DataLoader.generateDataset(descriptor, false, fs, path);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java Sun Oct 27 22:42:41 2013
@@ -27,10 +27,10 @@ import com.google.common.base.Charsets;
import com.google.common.io.Closeables;
import com.google.common.io.Files;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.classifier.df.data.Dataset.Attribute;
+import org.apache.mahout.common.MahoutTestCase;
/**
* Helper methods used by the tests
@@ -249,7 +249,8 @@ public final class Utils {
public static Path writeDataToTestFile(String[] sData) throws IOException {
Path testData = new Path("testdata/Data");
- FileSystem fs = testData.getFileSystem(new Configuration());
+ MahoutTestCase ca = new MahoutTestCase();
+ FileSystem fs = testData.getFileSystem(ca.getConfiguration());
if (!fs.exists(testData)) {
fs.mkdirs(testData);
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/InMemInputFormatTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/InMemInputFormatTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/InMemInputFormatTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/inmem/InMemInputFormatTest.java Sun Oct 27 22:42:41 2013
@@ -43,7 +43,7 @@ public final class InMemInputFormatTest
int numSplits = rng.nextInt(maxNumSplits) + 1;
int nbTrees = rng.nextInt(maxNbTrees) + 1;
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
Builder.setNbTrees(conf, nbTrees);
InMemInputFormat inputFormat = new InMemInputFormat();
@@ -86,7 +86,7 @@ public final class InMemInputFormatTest
int numSplits = rng.nextInt(maxNumSplits) + 1;
int nbTrees = rng.nextInt(maxNbTrees) + 1;
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
Builder.setNbTrees(conf, nbTrees);
InMemInputFormat inputFormat = new InMemInputFormat();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/partial/PartialBuilderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/partial/PartialBuilderTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/partial/PartialBuilderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/mapreduce/partial/PartialBuilderTest.java Sun Oct 27 22:42:41 2013
@@ -50,7 +50,7 @@ public final class PartialBuilderTest ex
@Test
public void testProcessOutput() throws Exception {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.setInt("mapred.map.tasks", NUM_MAPS);
Random rng = RandomUtils.getRandom();
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java Sun Oct 27 22:42:41 2013
@@ -30,6 +30,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.canopy.CanopyDriver;
import org.apache.mahout.clustering.iterator.CanopyClusteringPolicy;
@@ -128,7 +129,7 @@ public class ClusterClassificationDriver
clusteringOutputPath = getTestTempDirPath("output");
classifiedOutputPath = getTestTempDirPath("classify");
- conf = new Configuration();
+ conf = getConfiguration();
ClusteringTestUtils.writePointsToFile(points,
new Path(pointsPath, "file1"), fs, conf);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestEigenSeedGenerator.java Sun Oct 27 22:42:41 2013
@@ -61,7 +61,7 @@ public final class TestEigenSeedGenerato
@Before
public void setUp() throws Exception {
super.setUp();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
fs = FileSystem.get(conf);
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java Sun Oct 27 22:42:41 2013
@@ -60,7 +60,7 @@ public final class TestRandomSeedGenerat
@Before
public void setUp() throws Exception {
super.setUp();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
fs = FileSystem.get(conf);
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java Sun Oct 27 22:42:41 2013
@@ -70,7 +70,7 @@ public class TestAffinityMatrixInputJob
@Test
public void testAffinityMatrixInputMapper() throws Exception {
AffinityMatrixInputMapper mapper = new AffinityMatrixInputMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writer and the M/R context
@@ -97,7 +97,7 @@ public class TestAffinityMatrixInputJob
@Test
public void testAffinitymatrixInputReducer() throws Exception {
AffinityMatrixInputMapper mapper = new AffinityMatrixInputMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writer and the M/R context
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java Sun Oct 27 22:42:41 2013
@@ -54,7 +54,7 @@ public class TestMatrixDiagonalizeJob ex
@Test
public void testMatrixDiagonalizeMapper() throws Exception {
MatrixDiagonalizeMapper mapper = new MatrixDiagonalizeMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writers
@@ -78,7 +78,7 @@ public class TestMatrixDiagonalizeJob ex
@Test
public void testMatrixDiagonalizeReducer() throws Exception {
MatrixDiagonalizeMapper mapper = new MatrixDiagonalizeMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writers
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java Sun Oct 27 22:42:41 2013
@@ -37,7 +37,7 @@ public class TestUnitVectorizerJob exten
@Test
public void testUnitVectorizerMapper() throws Exception {
UnitVectorizerMapper mapper = new UnitVectorizerMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
// set up the dummy writers
DummyRecordWriter<IntWritable, VectorWritable> writer = new
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java Sun Oct 27 22:42:41 2013
@@ -41,7 +41,7 @@ public class TestVectorCache extends Mah
@Test
public void testSave() throws Exception {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
Writable key = new IntWritable(0);
Vector value = new DenseVector(VECTOR);
Path path = getTestTempDirPath("output");
@@ -64,7 +64,7 @@ public class TestVectorCache extends Mah
@Test
public void testLoad() throws Exception {
// save a vector manually
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
Writable key = new IntWritable(0);
Vector value = new DenseVector(VECTOR);
Path path = getTestTempDirPath("output");
@@ -92,7 +92,7 @@ public class TestVectorCache extends Mah
@Test
public void testAll() throws Exception {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
Vector v = new DenseVector(VECTOR);
Path toSave = getTestTempDirPath("output");
Writable key = new IntWritable(0);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java Sun Oct 27 22:42:41 2013
@@ -43,7 +43,7 @@ public class TestVectorMatrixMultiplicat
@Test
public void testVectorMatrixMultiplicationMapper() throws Exception {
VectorMatrixMultiplicationMapper mapper = new VectorMatrixMultiplicationMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
// set up all the parameters for the job
Vector toSave = new DenseVector(VECTOR);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java Sun Oct 27 22:42:41 2013
@@ -34,6 +34,7 @@ import org.apache.hadoop.mrunit.mapreduc
import org.apache.mahout.clustering.ClusteringUtils;
import org.apache.mahout.clustering.streaming.cluster.DataUtils;
import org.apache.mahout.clustering.streaming.cluster.StreamingKMeans;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
@@ -56,7 +57,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
@RunWith(Parameterized.class)
-public class StreamingKMeansTestMR {
+public class StreamingKMeansTestMR extends MahoutTestCase {
private static final int NUM_DATA_POINTS = 1 << 15;
private static final int NUM_DIMENSIONS = 8;
private static final int NUM_PROJECTIONS = 3;
@@ -232,7 +233,7 @@ public class StreamingKMeansTestMR {
@Test
public void testHypercubeMapReduceRunSequentially() throws Exception {
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
configure(configuration);
configuration.set(DefaultOptionCreator.METHOD_OPTION, DefaultOptionCreator.SEQUENTIAL_METHOD);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java Sun Oct 27 22:42:41 2013
@@ -56,7 +56,7 @@ public final class ClusterCountReaderTes
@Before
public void setUp() throws Exception {
super.setUp();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
fs = FileSystem.get(conf);
}
@@ -79,7 +79,7 @@ public final class ClusterCountReaderTes
List<VectorWritable> points = getPointsWritable(REFERENCE);
Path pointsPath = getTestTempDirPath("points");
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
ClusteringTestUtils.writePointsToFile(points, new Path(pointsPath, "file1"), fs, conf);
ClusteringTestUtils.writePointsToFile(points, new Path(pointsPath, "file2"), fs, conf);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java Sun Oct 27 22:42:41 2013
@@ -66,7 +66,7 @@ public final class ClusterOutputPostProc
@Before
public void setUp() throws Exception {
super.setUp();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
fs = FileSystem.get(conf);
}
@@ -89,7 +89,7 @@ public final class ClusterOutputPostProc
List<VectorWritable> points = getPointsWritable(REFERENCE);
Path pointsPath = getTestTempDirPath("points");
- conf = new Configuration();
+ conf = getConfiguration();
ClusteringTestUtils.writePointsToFile(points, new Path(pointsPath, "file1"), fs, conf);
ClusteringTestUtils.writePointsToFile(points, new Path(pointsPath, "file2"), fs, conf);
@@ -202,4 +202,4 @@ public final class ClusterOutputPostProc
CanopyDriver.run(conf, pointsPath, outputPath, new ManhattanDistanceMeasure(), 3.1, 2.1, true, 0.0, true);
}
-}
\ No newline at end of file
+}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java Sun Oct 27 22:42:41 2013
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.Path;
import org.junit.After;
import org.junit.Before;
-public abstract class MahoutTestCase extends org.apache.mahout.math.MahoutTestCase {
+public class MahoutTestCase extends org.apache.mahout.math.MahoutTestCase {
/** "Close enough" value for floating-point comparisons. */
public static final double EPSILON = 0.000001;
@@ -64,7 +64,7 @@ public abstract class MahoutTestCase ext
super.tearDown();
}
- protected final Configuration getConfiguration() throws IOException {
+ public final Configuration getConfiguration() throws IOException {
Configuration conf = new Configuration();
conf.set("hadoop.tmp.dir", getTestTempDir("hadoop" + Math.random()).getAbsolutePath());
return conf;
@@ -72,7 +72,7 @@ public abstract class MahoutTestCase ext
protected final Path getTestTempDirPath() throws IOException {
if (testTempDirPath == null) {
- fs = FileSystem.get(new Configuration());
+ fs = FileSystem.get(getConfiguration());
long simpleRandomLong = (long) (Long.MAX_VALUE * Math.random());
testTempDirPath = fs.makeQualified(
new Path("/tmp/mahout-" + getClass().getSimpleName() + '-' + simpleRandomLong));
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/TestDistributedRowMatrix.java Sun Oct 27 22:42:41 2013
@@ -378,8 +378,8 @@ public final class TestDistributedRowMat
return saveToFs(c, baseTmpDirPath);
}
- private static DistributedRowMatrix saveToFs(final Matrix m, Path baseTmpDirPath) throws IOException {
- Configuration conf = new Configuration();
+ private DistributedRowMatrix saveToFs(final Matrix m, Path baseTmpDirPath) throws IOException {
+ Configuration conf = getConfiguration();
FileSystem fs = FileSystem.get(baseTmpDirPath.toUri(), conf);
ClusteringTestUtils.writePointsToFile(new Iterable<VectorWritable>() {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java Sun Oct 27 22:42:41 2013
@@ -170,7 +170,7 @@ public class TestVectorDistanceSimilarit
List<VectorWritable> points = getPointsWritable(REFERENCE);
List<VectorWritable> seeds = getPointsWritable(SEEDS);
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
ClusteringTestUtils.writePointsToFile(points, true, new Path(input, "file1"), fs, conf);
ClusteringTestUtils.writePointsToFile(seeds, true, new Path(seedsPath, "part-seeds"), fs, conf);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverDenseTest.java Sun Oct 27 22:42:41 2013
@@ -69,7 +69,7 @@ public class LocalSSVDSolverDenseTest ex
public void runSSVDSolver(int q) throws IOException {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set("mapred.job.tracker", "local");
conf.set("fs.default.name", "file:///");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java Sun Oct 27 22:42:41 2013
@@ -71,7 +71,7 @@ public class LocalSSVDSolverSparseSequen
public void runSSVDSolver(int q) throws IOException {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set("mapred.job.tracker", "local");
conf.set("fs.default.name", "file:///");
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDTestsHelper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDTestsHelper.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDTestsHelper.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDTestsHelper.java Sun Oct 27 22:42:41 2013
@@ -26,6 +26,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Writable;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.DenseVector;
@@ -115,7 +116,8 @@ public final class SSVDTestsHelper {
// do not use. for internal consumption only.
public static void main(String[] args) throws Exception {
// create 1Gb input for distributed tests.
- Configuration conf = new Configuration();
+ MahoutTestCase ca = new MahoutTestCase();
+ Configuration conf = ca.getConfiguration();
FileSystem dfs = FileSystem.getLocal(conf);
Path outputDir=new Path("/tmp/DRM");
dfs.mkdirs(outputDir);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocMapperTest.java Sun Oct 27 22:42:41 2013
@@ -72,7 +72,7 @@ public final class CollocMapperTest exte
{"t_of", "worst of"},};
// set up expectations for mocks. ngram max size = 2
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set(CollocMapper.MAX_SHINGLE_SIZE, "2");
EasyMock.expect(context.getConfiguration()).andReturn(conf);
@@ -134,7 +134,7 @@ public final class CollocMapperTest exte
{"u_times", "times"},};
// set up expectations for mocks. ngram max size = 2
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set(CollocMapper.MAX_SHINGLE_SIZE, "2");
conf.setBoolean(CollocDriver.EMIT_UNIGRAMS, true);
EasyMock.expect(context.getConfiguration()).andReturn(conf);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java Sun Oct 27 22:42:41 2013
@@ -90,7 +90,7 @@ public final class LLRReducerTest extend
{1, 0, 1, 5} // worst of
};
- Configuration config = new Configuration();
+ Configuration config = getConfiguration();
config.set(LLRReducer.NGRAM_TOTAL, "7");
EasyMock.expect(context.getConfiguration()).andReturn(config);
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/clustering/display/ClustersFilterTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/clustering/display/ClustersFilterTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/clustering/display/ClustersFilterTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/clustering/display/ClustersFilterTest.java Sun Oct 27 22:42:41 2013
@@ -35,7 +35,7 @@ public class ClustersFilterTest extends
@Before
public void setUp() throws Exception {
super.setUp();
- configuration = new Configuration();
+ configuration = getConfiguration();
output = getTestTempDirPath();
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java Sun Oct 27 22:42:41 2013
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -82,7 +83,7 @@ public final class TestClusterDumper ext
@Before
public void setUp() throws Exception {
super.setUp();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
FileSystem fs = FileSystem.get(conf);
// Create test data
getSampleData(DOCS);
@@ -175,7 +176,7 @@ public final class TestClusterDumper ext
DistanceMeasure measure = new EuclideanDistanceMeasure();
Path output = getTestTempDirPath("output");
- CanopyDriver.run(new Configuration(), getTestTempDirPath("testdata"),
+ CanopyDriver.run(getConfiguration(), getTestTempDirPath("testdata"),
output, measure, 8, 4, true, 0.0, true);
// run ClusterDumper
ClusterDumper clusterDumper = new ClusterDumper(new Path(output,
@@ -206,7 +207,7 @@ public final class TestClusterDumper ext
DistanceMeasure measure = new EuclideanDistanceMeasure();
// now run the Canopy job to prime kMeans canopies
Path output = getTestTempDirPath("output");
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
CanopyDriver.run(conf, getTestTempDirPath("testdata"), output, measure, 8,
4, false, 0.0, true);
// now run the Fuzzy KMeans job
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java Sun Oct 27 22:42:41 2013
@@ -71,7 +71,7 @@ public final class TestClusterEvaluator
@Before
public void setUp() throws Exception {
super.setUp();
- conf = new Configuration();
+ conf = getConfiguration();
fs = FileSystem.get(conf);
testdata = getTestTempDirPath("testdata");
output = getTestTempDirPath("output");
@@ -262,7 +262,7 @@ public final class TestClusterEvaluator
public void testCanopy() throws Exception {
ClusteringTestUtils.writePointsToFile(sampleData, new Path(testdata, "file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
CanopyDriver.run(conf, testdata, output, measure, 3.1, 1.1, true, 0.0, true);
int numIterations = 10;
Path clustersIn = new Path(output, "clusters-0-final");
@@ -280,7 +280,7 @@ public final class TestClusterEvaluator
ClusteringTestUtils.writePointsToFile(sampleData, new Path(testdata, "file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
// now run the Canopy job to prime kMeans canopies
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
CanopyDriver.run(conf, testdata, output, measure, 3.1, 1.1, false, 0.0, true);
// now run the KMeans job
Path kmeansOutput = new Path(output, "kmeans");
@@ -301,7 +301,7 @@ public final class TestClusterEvaluator
ClusteringTestUtils.writePointsToFile(sampleData, new Path(testdata, "file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
// now run the Canopy job to prime kMeans canopies
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
CanopyDriver.run(conf, testdata, output, measure, 3.1, 1.1, false, 0.0, true);
Path fuzzyKMeansOutput = new Path(output, "fuzzyk");
// now run the KMeans job
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java Sun Oct 27 22:42:41 2013
@@ -75,7 +75,7 @@ public final class TestCDbwEvaluator ext
@Before
public void setUp() throws Exception {
super.setUp();
- conf = new Configuration();
+ conf = getConfiguration();
fs = FileSystem.get(conf);
testdata = getTestTempDirPath("testdata");
output = getTestTempDirPath("output");
@@ -266,7 +266,7 @@ public final class TestCDbwEvaluator ext
public void testCanopy() throws Exception {
ClusteringTestUtils.writePointsToFile(sampleData, getTestTempFilePath("testdata/file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
- CanopyDriver.run(new Configuration(), testdata, output, measure, 3.1, 2.1, true, 0.0, true);
+ CanopyDriver.run(getConfiguration(), testdata, output, measure, 3.1, 2.1, true, 0.0, true);
int numIterations = 10;
Path clustersIn = new Path(output, "clusters-0-final");
RepresentativePointsDriver.run(conf, clustersIn, new Path(output, "clusteredPoints"), output, measure,
@@ -285,7 +285,7 @@ public final class TestCDbwEvaluator ext
ClusteringTestUtils.writePointsToFile(sampleData, getTestTempFilePath("testdata/file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
// now run the Canopy job to prime kMeans canopies
- CanopyDriver.run(new Configuration(), testdata, output, measure, 3.1, 2.1, false, 0.0, true);
+ CanopyDriver.run(getConfiguration(), testdata, output, measure, 3.1, 2.1, false, 0.0, true);
// now run the KMeans job
Path kmeansOutput = new Path(output, "kmeans");
KMeansDriver.run(testdata, new Path(output, "clusters-0-final"), kmeansOutput, measure, 0.001, 10, true, 0.0, true);
@@ -307,7 +307,7 @@ public final class TestCDbwEvaluator ext
ClusteringTestUtils.writePointsToFile(sampleData, getTestTempFilePath("testdata/file1"), fs, conf);
DistanceMeasure measure = new EuclideanDistanceMeasure();
// now run the Canopy job to prime kMeans canopies
- CanopyDriver.run(new Configuration(), testdata, output, measure, 3.1, 2.1, false, 0.0, true);
+ CanopyDriver.run(getConfiguration(), testdata, output, measure, 3.1, 2.1, false, 0.0, true);
Path fuzzyKMeansOutput = new Path(output, "fuzzyk");
// now run the KMeans job
FuzzyKMeansDriver.run(testdata, new Path(output, "clusters-0-final"), fuzzyKMeansOutput, measure, 0.001, 10, 2,
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputFormatTest.java Sun Oct 27 22:42:41 2013
@@ -41,7 +41,8 @@ public class LuceneSegmentInputFormatTes
@Before
public void before() throws Exception {
inputFormat = new LuceneSegmentInputFormat();
- LuceneStorageConfiguration lucene2SeqConf = new LuceneStorageConfiguration(new Configuration(), Collections.singletonList(indexPath1), new Path("output"), "id", Collections.singletonList("field"));
+ LuceneStorageConfiguration lucene2SeqConf = new
+ LuceneStorageConfiguration(getConfiguration(), Collections.singletonList(indexPath1), new Path("output"), "id", Collections.singletonList("field"));
conf = lucene2SeqConf.serialize();
jobContext = getJobContext(conf, new JobID());
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentInputSplitTest.java Sun Oct 27 22:42:41 2013
@@ -37,7 +37,7 @@ public class LuceneSegmentInputSplitTest
@Before
public void before() throws IOException {
- configuration = new Configuration();
+ configuration = getConfiguration();
}
@After
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneSegmentRecordReaderTest.java Sun Oct 27 22:42:41 2013
@@ -39,7 +39,8 @@ public class LuceneSegmentRecordReaderTe
@Before
public void before() throws IOException, InterruptedException {
- LuceneStorageConfiguration lucene2SeqConf = new LuceneStorageConfiguration(new Configuration(), asList(getIndexPath1()), new Path("output"), "id", asList("field"));
+ LuceneStorageConfiguration lucene2SeqConf = new
+ LuceneStorageConfiguration(getConfiguration(), asList(getIndexPath1()), new Path("output"), "id", asList("field"));
configuration = lucene2SeqConf.serialize();
commitDocuments(getDirectory(getIndexPath1AsFile()), docs.subList(0, 500));
commitDocuments(getDirectory(getIndexPath1AsFile()), docs.subList(500, 1000));
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/LuceneStorageConfigurationTest.java Sun Oct 27 22:42:41 2013
@@ -18,6 +18,7 @@ package org.apache.mahout.text;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.mahout.common.MahoutTestCase;
import org.junit.Test;
import java.io.IOException;
@@ -25,11 +26,11 @@ import java.io.IOException;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
-public class LuceneStorageConfigurationTest {
+public class LuceneStorageConfigurationTest extends MahoutTestCase {
@Test
public void testSerialization() throws Exception {
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
Path indexPath = new Path("indexPath");
Path outputPath = new Path("outputPath");
LuceneStorageConfiguration luceneStorageConfiguration =
@@ -44,6 +45,6 @@ public class LuceneStorageConfigurationT
@Test(expected = IllegalArgumentException.class)
public void testSerializationNotSerialized() throws IOException {
- new LuceneStorageConfiguration(new Configuration());
+ new LuceneStorageConfiguration(getConfiguration());
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageDriverTest.java Sun Oct 27 22:42:41 2013
@@ -48,7 +48,7 @@ public class SequenceFilesFromLuceneStor
@Before
public void before() throws Exception {
- conf = new Configuration();
+ conf = getConfiguration();
conf.set("io.serializations", "org.apache.hadoop.io.serializer.JavaSerialization,"
+ "org.apache.hadoop.io.serializer.WritableSerialization");
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageMRJobTest.java Sun Oct 27 22:42:41 2013
@@ -41,7 +41,7 @@ public class SequenceFilesFromLuceneStor
@Before
public void before() throws IOException {
lucene2seq = new SequenceFilesFromLuceneStorageMRJob();
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
Path seqOutputPath = new Path(getTestTempDirPath(), "seqOutputPath");//don't make the output directory
lucene2SeqConf = new LuceneStorageConfiguration(configuration, asList(getIndexPath1(), getIndexPath2()),
seqOutputPath, SingleFieldDocument.ID_FIELD, asList(SingleFieldDocument.FIELD));
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromLuceneStorageTest.java Sun Oct 27 22:42:41 2013
@@ -48,7 +48,7 @@ public class SequenceFilesFromLuceneStor
@Before
public void before() throws IOException {
- configuration = new Configuration();
+ configuration = getConfiguration();
seqFilesOutputPath = new Path(getTestTempDirPath(), "seqfiles");
lucene2Seq = new SequenceFilesFromLuceneStorage();
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=1536215&r1=1536214&r2=1536215&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 Sun Oct 27 22:42:41 2013
@@ -98,7 +98,7 @@ public final class SequenceFilesFromMail
String expectedChunkPath = expectedChunkFile.getAbsolutePath();
Assert.assertTrue("Expected chunk file " + expectedChunkPath + " not found!", expectedChunkFile.isFile());
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
SequenceFileIterator<Text, Text> iterator = new SequenceFileIterator<Text, Text>(new Path(expectedChunkPath), true, conf);
Assert.assertTrue("First key/value pair not found!", iterator.hasNext());
Pair<Text, Text> record = iterator.next();
@@ -131,7 +131,7 @@ public final class SequenceFilesFromMail
Path tmpDir = this.getTestTempDirPath();
Path mrOutputDir = new Path(tmpDir, "mail-archives-out-mr");
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
FileSystem fs = FileSystem.get(configuration);
File expectedInputFile = new File(inputDir.toString());
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=1536215&r1=1536214&r2=1536215&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 Sun Oct 27 22:42:41 2013
@@ -59,7 +59,7 @@ public final class TestSequenceFilesFrom
@Test
public void testSequenceFileFromDirectoryBasic() throws Exception {
// parameters
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
FileSystem fs = FileSystem.get(configuration);
@@ -108,7 +108,7 @@ public final class TestSequenceFilesFrom
@Test
public void testSequenceFileFromDirectoryMapReduce() throws Exception {
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
FileSystem fs = FileSystem.get(conf);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/TestConcatenateVectorsJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/TestConcatenateVectorsJob.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/TestConcatenateVectorsJob.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/TestConcatenateVectorsJob.java Sun Oct 27 22:42:41 2013
@@ -50,7 +50,7 @@ public class TestConcatenateVectorsJob e
@Test
public void testConcatenateVectorsReducer() throws Exception {
- Configuration configuration = new Configuration();
+ Configuration configuration = getConfiguration();
configuration.set(ConcatenateVectorsJob.MATRIXA_DIMS, "5");
configuration.set(ConcatenateVectorsJob.MATRIXB_DIMS, "3");
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java Sun Oct 27 22:42:41 2013
@@ -32,7 +32,7 @@ public final class RegexMapperTest exten
@Test
public void testRegex() throws Exception {
RegexMapper mapper = new RegexMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set(RegexMapper.REGEX, "(?<=(\\?|&)q=).*?(?=&|$)");
conf.set(RegexMapper.TRANSFORMER_CLASS, URLDecodeTransformer.class.getName());
DummyRecordWriter<LongWritable, Text> mapWriter = new DummyRecordWriter<LongWritable, Text>();
@@ -56,7 +56,7 @@ public final class RegexMapperTest exten
@Test
public void testGroups() throws Exception {
RegexMapper mapper = new RegexMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set(RegexMapper.REGEX, "(\\d+)\\.(\\d+)\\.(\\d+)");
conf.set(RegexMapper.TRANSFORMER_CLASS, URLDecodeTransformer.class.getName());
conf.setStrings(RegexMapper.GROUP_MATCHERS, "1", "3");
@@ -79,7 +79,7 @@ public final class RegexMapperTest exten
@Test
public void testFPGFormatter() throws Exception {
RegexMapper mapper = new RegexMapper();
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
conf.set(RegexMapper.REGEX, "(?<=(\\?|&)q=).*?(?=&|$)");
conf.set(RegexMapper.TRANSFORMER_CLASS, URLDecodeTransformer.class.getName());
conf.set(RegexMapper.FORMATTER_CLASS, FPGFormatter.class.getName());
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=1536215&r1=1536214&r2=1536215&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 Sun Oct 27 22:42:41 2013
@@ -41,7 +41,7 @@ public final class VectorWriterTest exte
@Test
public void testSFVW() throws Exception {
Path path = getTestTempFilePath("sfvw");
- Configuration conf = new Configuration();
+ Configuration conf = getConfiguration();
FileSystem fs = FileSystem.get(conf);
SequenceFile.Writer seqWriter = new SequenceFile.Writer(fs, conf, path, LongWritable.class, VectorWritable.class);
SequenceFileVectorWriter writer = new SequenceFileVectorWriter(seqWriter);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java?rev=1536215&r1=1536214&r2=1536215&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java Sun Oct 27 22:42:41 2013
@@ -59,7 +59,7 @@ public class DriverTest extends MahoutTe
outputDir = getTestTempDir("output");
outputDir.delete();
- conf = new Configuration();
+ conf = getConfiguration();
}
private Document asDocument(String line) {