You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/01/17 20:41:28 UTC
svn commit: r900199 [1/2] - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/common/
core/src/test/java/org/apache/mahout/cf/taste/impl/
core/src/test/java/org/apache/mahout/classifier/bayes/
core/src/test/java/org/apache/mahout/classifier...
Author: srowen
Date: Sun Jan 17 19:41:24 2010
New Revision: 900199
URL: http://svn.apache.org/viewvc?rev=900199&view=rev
Log:
All test cases extend MahoutTestCase, and related updates to use of RandomUtils to ensure in test mode that all RNGs are deterministic. Minor code style changes. Unit tests now do not fork a JVM per test.
Added:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputFormatTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/TransactionTreeTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeapTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/STFitnessEvaluatorTest.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/df/mapreduce/BuildForest.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDCrossoverTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDFitnessTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDMutationTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/CDRuleTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplitTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombinerTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducerTest.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/GenericSortingTest.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/MatrixTest.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/SortingTest.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseMatrix.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestOrderedIntDoubleMapping.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseColumnMatrix.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseMatrix.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseRowMatrix.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestVectorView.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/stats/LogLikelihoodTest.java
lucene/mahout/trunk/maven/pom.xml
lucene/mahout/trunk/utils/pom.xml
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
lucene/mahout/trunk/utils/src/test/java/org/apache/mahout/utils/vectors/text/DictionaryVectorizerTest.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/RandomUtils.java Sun Jan 17 19:41:24 2010
@@ -30,6 +30,12 @@
*/
public final class RandomUtils {
+ public static void main(String[] args) {
+ int i = 1;
+System.out.print(i += i++);
+System.out.print(i);
+ }
+
private static final byte[] STANDARD_SEED = "Mahout=Hadoop+ML".getBytes(Charset.forName("US-ASCII"));
private static boolean testSeed;
@@ -49,6 +55,10 @@
}
public static Random getRandom(long seed) {
+ return new MersenneTwisterRNG(longSeedtoBytes(seed));
+ }
+
+ public static byte[] longSeedtoBytes(long seed) {
byte[] seedBytes = new byte[16];
seedBytes[0] = (byte) (seed >>> 56);
seedBytes[1] = (byte) (seed >>> 48);
@@ -59,7 +69,19 @@
seedBytes[6] = (byte) (seed >>> 8);
seedBytes[7] = (byte) seed;
System.arraycopy(seedBytes, 0, seedBytes, 8, 8);
- return new MersenneTwisterRNG(seedBytes);
+ return seedBytes;
+ }
+
+ public static long seedBytesToLong(byte[] seed) {
+ return
+ ((seed[0] & 0xFFL) << 56) |
+ ((seed[1] & 0xFFL) << 48) |
+ ((seed[2] & 0xFFL) << 40) |
+ ((seed[3] & 0xFFL) << 32) |
+ ((seed[4] & 0xFFL) << 24) |
+ ((seed[5] & 0xFFL) << 16) |
+ ((seed[6] & 0xFFL) << 8) |
+ (seed[7] & 0xFFL);
}
/** @return what {@link Double#hashCode()} would return for the same value */
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java Sun Jan 17 19:41:24 2010
@@ -17,9 +17,8 @@
package org.apache.mahout.cf.taste.impl;
-import junit.framework.TestCase;
import org.apache.mahout.cf.taste.impl.common.FastByIDMap;
-import org.apache.mahout.common.RandomUtils;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.cf.taste.impl.model.GenericDataModel;
import org.apache.mahout.cf.taste.impl.model.GenericPreference;
import org.apache.mahout.cf.taste.impl.model.GenericUserPreferenceArray;
@@ -30,17 +29,11 @@
import java.util.ArrayList;
import java.util.List;
-public abstract class TasteTestCase extends TestCase {
+public abstract class TasteTestCase extends MahoutTestCase {
/** "Close enough" value for floating-point comparisons. */
public static final double EPSILON = 0.00001;
- @Override
- public void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public static DataModel getDataModel(long[] userIDs, Double[][] prefValues) {
FastByIDMap<PreferenceArray> result = new FastByIDMap<PreferenceArray>();
for (int i = 0; i < userIDs.length; i++) {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesClassifierTest.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.classifier.bayes;
-import junit.framework.TestCase;
import org.apache.mahout.classifier.ClassifierResult;
import org.apache.mahout.classifier.bayes.algorithm.BayesAlgorithm;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
@@ -25,17 +24,14 @@
import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
import org.apache.mahout.classifier.bayes.model.ClassifierContext;
+import org.apache.mahout.common.MahoutTestCase;
-public class BayesClassifierTest extends TestCase {
+public class BayesClassifierTest extends MahoutTestCase {
protected Algorithm algorithm;
protected InMemoryBayesDatastore store;
- public BayesClassifierTest(String s) {
- super(s);
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java Sun Jan 17 19:41:24 2010
@@ -20,8 +20,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
@@ -29,9 +27,10 @@
import org.apache.mahout.classifier.bayes.common.BayesParameters;
import org.apache.mahout.classifier.bayes.mapreduce.common.BayesFeatureMapper;
import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.StringTuple;
-public class BayesFeatureMapperTest extends TestCase {
+public class BayesFeatureMapperTest extends MahoutTestCase {
public void test() throws Exception {
BayesFeatureMapper mapper = new BayesFeatureMapper();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFileFormatterTest.java Sun Jan 17 19:41:24 2010
@@ -24,24 +24,19 @@
import java.io.Writer;
import java.nio.charset.Charset;
-import junit.framework.TestCase;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.mahout.classifier.BayesFileFormatter;
import org.apache.mahout.common.FileLineIterable;
import org.apache.mahout.common.FileLineIterator;
+import org.apache.mahout.common.MahoutTestCase;
-public class BayesFileFormatterTest extends TestCase {
+public class BayesFileFormatterTest extends MahoutTestCase {
protected File input;
protected File out;
protected String[] words;
- public BayesFileFormatterTest(String s) {
- super(s);
- }
-
@Override
protected void setUp() throws Exception {
super.setUp();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.classifier.bayes;
-import junit.framework.TestCase;
import org.apache.mahout.classifier.ClassifierResult;
import org.apache.mahout.classifier.bayes.algorithm.CBayesAlgorithm;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
@@ -25,16 +24,13 @@
import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
import org.apache.mahout.classifier.bayes.model.ClassifierContext;
+import org.apache.mahout.common.MahoutTestCase;
-public class CBayesClassifierTest extends TestCase {
+public class CBayesClassifierTest extends MahoutTestCase {
protected Algorithm algorithm;
protected InMemoryBayesDatastore store;
-
- public CBayesClassifierTest(String s) {
- super(s);
- }
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/LinearModelTest.java Sun Jan 17 19:41:24 2010
@@ -1,15 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.classifier.discriminative;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
-import junit.framework.TestCase;
-
-public class LinearModelTest extends TestCase {
+public class LinearModelTest extends MahoutTestCase {
private LinearModel model;
private Vector hyperplane;
+ @Override
protected void setUp() throws Exception {
super.setUp();
double[] values = {0.0, 1.0, 0.0, 1.0, 0.0};
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/PerceptronTrainerTest.java Sun Jan 17 19:41:24 2010
@@ -1,16 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.classifier.discriminative;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Matrix;
import org.apache.mahout.math.Vector;
-import junit.framework.TestCase;
-
-public class PerceptronTrainerTest extends TestCase {
+public class PerceptronTrainerTest extends MahoutTestCase {
private PerceptronTrainer trainer;
+ @Override
protected void setUp() throws Exception {
super.setUp();
trainer = new PerceptronTrainer(3, 0.5, 0.1, 1.0, 1.0);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/WinnowTrainerTest.java Sun Jan 17 19:41:24 2010
@@ -1,17 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.classifier.discriminative;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Matrix;
import org.apache.mahout.math.Vector;
-import junit.framework.TestCase;
-
-
-public class WinnowTrainerTest extends TestCase {
+public class WinnowTrainerTest extends MahoutTestCase {
private WinnowTrainer trainer;
+ @Override
protected void setUp() throws Exception {
super.setUp();
trainer = new WinnowTrainer(3);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.canopy;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -27,6 +26,7 @@
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.lib.IdentityReducer;
import org.apache.mahout.clustering.ClusteringTestUtils;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
@@ -43,7 +43,8 @@
import java.util.Map;
import java.util.Set;
-public class TestCanopyCreation extends TestCase {
+public class TestCanopyCreation extends MahoutTestCase {
+
static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
{3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
@@ -61,10 +62,6 @@
FileSystem fs;
- public TestCanopyCreation(String name) {
- super(name);
- }
-
private static List<VectorWritable> getPoints(double[][] raw) {
List<VectorWritable> points = new ArrayList<VectorWritable>();
int i = 0;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDirichletClustering.java Sun Jan 17 19:41:24 2010
@@ -17,27 +17,24 @@
package org.apache.mahout.clustering.dirichlet;
-import junit.framework.TestCase;
import org.apache.mahout.clustering.dirichlet.models.AsymmetricSampledNormalDistribution;
import org.apache.mahout.clustering.dirichlet.models.Model;
import org.apache.mahout.clustering.dirichlet.models.NormalModelDistribution;
import org.apache.mahout.clustering.dirichlet.models.SampledNormalDistribution;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
-import org.apache.mahout.math.Vector;
-import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.math.VectorWritable;
import java.util.ArrayList;
import java.util.List;
-public class TestDirichletClustering extends TestCase {
+public class TestDirichletClustering extends MahoutTestCase {
private List<VectorWritable> sampleData;
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
sampleData = new ArrayList<VectorWritable>();
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestDistributions.java Sun Jan 17 19:41:24 2010
@@ -17,19 +17,11 @@
package org.apache.mahout.clustering.dirichlet;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.common.RandomUtils;
-
-public class TestDistributions extends TestCase {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
+public class TestDistributions extends MahoutTestCase {
public void testRbeta() {
for (double i = 0.01; i < 20; i += 0.25) {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java Sun Jan 17 19:41:24 2010
@@ -18,7 +18,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
@@ -34,6 +33,7 @@
import org.apache.mahout.clustering.dirichlet.models.SampledNormalModel;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.JsonVectorAdapter;
@@ -47,7 +47,7 @@
import java.util.List;
import java.util.Map;
-public class TestMapReduce extends TestCase {
+public class TestMapReduce extends MahoutTestCase {
private List<VectorWritable> sampleData = new ArrayList<VectorWritable>();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.fuzzykmeans;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -26,6 +25,7 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
@@ -38,7 +38,7 @@
import java.util.List;
import java.util.Map;
-public class TestFuzzyKmeansClustering extends TestCase {
+public class TestFuzzyKmeansClustering extends MahoutTestCase {
FileSystem fs;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,6 @@
package org.apache.mahout.clustering.kmeans;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -26,6 +25,7 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.canopy.CanopyDriver;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
@@ -44,7 +44,7 @@
import java.util.List;
import java.util.Map;
-public class TestKmeansClustering extends TestCase {
+public class TestKmeansClustering extends MahoutTestCase {
public static final double[][] reference = {{1, 1}, {2, 1}, {1, 2},
{2, 2}, {3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestRandomSeedGenerator.java Sun Jan 17 19:41:24 2010
@@ -23,9 +23,6 @@
import java.util.List;
import java.util.Set;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -33,11 +30,12 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.clustering.ClusteringTestUtils;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
-public class TestRandomSeedGenerator extends TestCase {
+public class TestRandomSeedGenerator extends MahoutTestCase {
static final double[][] raw = {{1, 1}, {2, 1}, {1, 2}, {2, 2},
{3, 3}, {4, 4}, {5, 4}, {4, 5}, {5, 5}};
@@ -104,19 +102,19 @@
while (reader.next(key, value)) {
clusterCount++;
int id = value.getId();
- Assert.assertTrue(set.add(id)); // validate unique id's
+ assertTrue(set.add(id)); // validate unique id's
Vector v = value.getCenter();
assertVectorEquals(raw[id], v); // validate values match
}
- Assert.assertEquals(4, clusterCount); // validate sample count
+ assertEquals(4, clusterCount); // validate sample count
}
public static void assertVectorEquals(double[] raw, Vector v) {
- Assert.assertEquals(raw.length, v.size());
+ assertEquals(raw.length, v.size());
for (int i=0; i < raw.length; i++) {
- Assert.assertEquals(raw[i], v.getQuick(i));
+ assertEquals(raw[i], v.getQuick(i));
}
}
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestLDAInference.java Sun Jan 17 19:41:24 2010
@@ -20,19 +20,18 @@
import java.util.Iterator;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.commons.math.distribution.PoissonDistribution;
import org.apache.commons.math.distribution.PoissonDistributionImpl;
import org.apache.commons.math.MathException;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Matrix;
import org.apache.mahout.math.Vector;
import org.apache.mahout.common.RandomUtils;
-public class TestLDAInference extends TestCase {
+public class TestLDAInference extends MahoutTestCase {
private static final int NUM_TOPICS = 20;
@@ -41,7 +40,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
random = RandomUtils.getRandom();
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/lda/TestMapReduce.java Sun Jan 17 19:41:24 2010
@@ -20,14 +20,12 @@
import java.util.Iterator;
import java.util.Random;
-import junit.framework.TestCase;
-
-
import org.apache.commons.math.distribution.PoissonDistribution;
import org.apache.commons.math.distribution.PoissonDistributionImpl;
import org.apache.commons.math.MathException;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.Matrix;
import org.apache.mahout.math.RandomAccessSparseVector;
@@ -36,7 +34,7 @@
import static org.easymock.classextension.EasyMock.*;
-public class TestMapReduce extends TestCase {
+public class TestMapReduce extends MahoutTestCase {
private static final int NUM_TESTS = 10;
private static final int NUM_TOPICS = 10;
@@ -81,7 +79,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
random = RandomUtils.getRandom();
File f = new File("input");
f.mkdir();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Sun Jan 17 19:41:24 2010
@@ -25,6 +25,7 @@
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.common.distance.DistanceMeasure;
@@ -38,7 +39,7 @@
import java.util.List;
import java.util.Map;
-public class TestMeanShift extends TestCase {
+public class TestMeanShift extends MahoutTestCase {
private Vector[] raw = null;
@@ -50,10 +51,6 @@
final DistanceMeasure euclideanDistanceMeasure = new EuclideanDistanceMeasure();
- public TestMeanShift(String name) {
- super(name);
- }
-
/**
* Print the canopies to the transcript
*
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java?rev=900199&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/MahoutTestCase.java Sun Jan 17 19:41:24 2010
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common;
+
+import junit.framework.TestCase;
+
+public abstract class MahoutTestCase extends TestCase {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ RandomUtils.useTestSeed();
+ }
+
+}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java Sun Jan 17 19:41:24 2010
@@ -17,12 +17,10 @@
package org.apache.mahout.common;
-import junit.framework.TestCase;
-
import java.util.Arrays;
import java.util.List;
-public class StringUtilsTest extends TestCase {
+public class StringUtilsTest extends MahoutTestCase {
private static class DummyTest {
private int field;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java Sun Jan 17 19:41:24 2010
@@ -17,12 +17,11 @@
package org.apache.mahout.common.distance;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
-public class CosineDistanceMeasureTest extends TestCase {
+public class CosineDistanceMeasureTest extends MahoutTestCase {
public void testMeasure() {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java Sun Jan 17 19:41:24 2010
@@ -17,13 +17,12 @@
package org.apache.mahout.common.distance;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
-public abstract class DefaultDistanceMeasureTest extends TestCase {
+public abstract class DefaultDistanceMeasureTest extends MahoutTestCase {
public abstract DistanceMeasure distanceMeasureFactory();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/EmptyIteratorTest.java Sun Jan 17 19:41:24 2010
@@ -17,12 +17,12 @@
package org.apache.mahout.common.iterator;
-import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import java.util.Iterator;
import java.util.NoSuchElementException;
-public final class EmptyIteratorTest extends TasteTestCase {
+public final class EmptyIteratorTest extends MahoutTestCase {
public void testIterator() {
Iterator<Object> mock = new EmptyIterator<Object>();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/IteratorUtilsTest.java Sun Jan 17 19:41:24 2010
@@ -17,7 +17,7 @@
package org.apache.mahout.common.iterator;
-import org.apache.mahout.cf.taste.impl.TasteTestCase;
+import org.apache.mahout.common.MahoutTestCase;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.TreeSet;
-public final class IteratorUtilsTest extends TasteTestCase {
+public final class IteratorUtilsTest extends MahoutTestCase {
private static final List<String> TEST_DATA;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/SamplerCase.java Sun Jan 17 19:41:24 2010
@@ -17,14 +17,13 @@
package org.apache.mahout.common.iterator;
-import junit.framework.TestCase;
-
import java.util.Iterator;
import java.util.Arrays;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-public abstract class SamplerCase extends TestCase {
+public abstract class SamplerCase extends MahoutTestCase {
// these provide access to the underlying implementation
protected abstract DelegatingIterator<Integer> createSampler(int n, Iterator<Integer> source);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java Sun Jan 17 19:41:24 2010
@@ -17,19 +17,11 @@
package org.apache.mahout.common.iterator;
-import junit.framework.TestCase;
-
import java.util.Iterator;
-import org.apache.mahout.common.RandomUtils;
-
-public class TestSamplingIterator extends TestCase {
+import org.apache.mahout.common.MahoutTestCase;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
+public class TestSamplingIterator extends MahoutTestCase {
public void testEmptyCase() {
assertFalse(new SamplingIterator<Integer>(Integers.iterator(0), 0.9999).hasNext());
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/builder/DefaultTreeBuilderTest.java Sun Jan 17 19:41:24 2010
@@ -21,18 +21,10 @@
import java.util.Arrays;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import org.apache.mahout.df.data.Data;
-import org.apache.mahout.df.data.Utils;
-import junit.framework.TestCase;
-
-public class DefaultTreeBuilderTest extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- RandomUtils.useTestSeed();
- }
+public class DefaultTreeBuilderTest extends MahoutTestCase {
/**
* make sure that DefaultTreeBuilder.randomAttributes() returns the correct number of attributes, that have not been
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataConverterTest.java Sun Jan 17 19:41:24 2010
@@ -19,21 +19,14 @@
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import junit.framework.TestCase;
-
-public class DataConverterTest extends TestCase {
+public class DataConverterTest extends MahoutTestCase {
private static final int nbAttributes = 10;
private static final int nbInstances = 100;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testConvert() throws Exception {
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataLoaderTest.java Sun Jan 17 19:41:24 2010
@@ -21,22 +21,20 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.Dataset.Attribute;
-public class DataLoaderTest extends TestCase {
+public class DataLoaderTest extends MahoutTestCase {
protected Random rng;
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
rng = RandomUtils.getRandom();
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DataTest.java Sun Jan 17 19:41:24 2010
@@ -21,12 +21,11 @@
import java.util.Arrays;
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.conditions.Condition;
-import junit.framework.TestCase;
-
-public class DataTest extends TestCase {
+public class DataTest extends MahoutTestCase {
protected static final int nbAttributes = 10;
@@ -39,7 +38,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
rng = RandomUtils.getRandom();
data = Utils.randomData(rng, nbAttributes, datasize);
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DatasetTest.java Sun Jan 17 19:41:24 2010
@@ -26,11 +26,10 @@
import java.io.IOException;
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import junit.framework.TestCase;
-
-public class DatasetTest extends TestCase {
+public class DatasetTest extends MahoutTestCase {
private static final int nbAttributes = 10;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/DescriptorUtilsTest.java Sun Jan 17 19:41:24 2010
@@ -19,19 +19,12 @@
import java.util.Random;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.Dataset.Attribute;
-public class DescriptorUtilsTest extends TestCase {
+public class DescriptorUtilsTest extends MahoutTestCase {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
/**
* Test method for
* {@link org.apache.mahout.df.data.DescriptorUtils#parseDescriptor(java.lang.String)}.
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/data/Utils.java Sun Jan 17 19:41:24 2010
@@ -38,7 +38,7 @@
* Helper methods used by the tests
*
*/
-public class Utils {
+public final class Utils {
private Utils() {
}
@@ -59,7 +59,7 @@
}
/** Used when generating random CATEGORICAL values */
- protected static final int CATEGORICAL_RANGE = 100;
+ static final int CATEGORICAL_RANGE = 100;
/**
* Generates a random list of tokens
@@ -197,7 +197,7 @@
* @param attrs attributes description
* @return
*/
- protected static double[] randomVector(Random rng, Attribute[] attrs) {
+ static double[] randomVector(Random rng, Attribute[] attrs) {
double[] vector = new double[attrs.length];
for (int attr = 0; attr < attrs.length; attr++) {
@@ -219,7 +219,7 @@
* @param v double array
* @return comma-separated string
*/
- protected static String double2String(double[] v) {
+ static String double2String(double[] v) {
StringBuilder builder = new StringBuilder();
for (double aV : v) {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputFormatTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputFormatTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputFormatTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputFormatTest.java Sun Jan 17 19:41:24 2010
@@ -19,25 +19,18 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.mapred.Builder;
import org.apache.mahout.df.mapred.inmem.InMemInputFormat.InMemInputSplit;
import org.apache.mahout.df.mapred.inmem.InMemInputFormat.InMemRecordReader;
-public class InMemInputFormatTest extends TestCase {
+public class InMemInputFormatTest extends MahoutTestCase {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public void testSplits() throws Exception {
int n = 1;
int maxNumSplits = 100;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/inmem/InMemInputSplitTest.java Sun Jan 17 19:41:24 2010
@@ -26,12 +26,11 @@
import java.io.IOException;
import java.util.Random;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.mapred.inmem.InMemInputFormat.InMemInputSplit;
-public class InMemInputSplitTest extends TestCase {
+public class InMemInputSplitTest extends MahoutTestCase {
private Random rng;
@@ -41,7 +40,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
rng = RandomUtils.getRandom();
byteOutStream = new ByteArrayOutputStream();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartialBuilderTest.java Sun Jan 17 19:41:24 2010
@@ -23,14 +23,13 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.Writer;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.DefaultTreeBuilder;
import org.apache.mahout.df.builder.TreeBuilder;
@@ -40,7 +39,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class PartialBuilderTest extends TestCase {
+public class PartialBuilderTest extends MahoutTestCase {
protected static final int numMaps = 5;
@@ -48,12 +47,6 @@
/** instances per partition */
protected static final int numInstances = 20;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testProcessOutput() throws Exception {
JobConf job = new JobConf();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/PartitionBugTest.java Sun Jan 17 19:41:24 2010
@@ -22,11 +22,10 @@
import java.io.IOException;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.callback.PredictionCallback;
@@ -37,7 +36,7 @@
import org.apache.mahout.df.data.Utils;
import org.apache.mahout.df.node.Node;
-public class PartitionBugTest extends TestCase {
+public class PartitionBugTest extends MahoutTestCase {
static final int numAttributes = 40;
static final int numInstances = 200;
@@ -46,12 +45,6 @@
static final int numMaps = 5;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
/**
* Make sure that the correct instance ids are being computed
*
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step0JobTest.java Sun Jan 17 19:41:24 2010
@@ -21,8 +21,6 @@
import java.util.Arrays;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
@@ -34,6 +32,7 @@
import org.apache.hadoop.mapred.RecordReader;
import org.apache.hadoop.mapred.Reporter;
import org.apache.hadoop.mapred.TextInputFormat;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.DataConverter;
import org.apache.mahout.df.data.DataLoader;
@@ -43,7 +42,7 @@
import org.apache.mahout.df.mapred.partial.Step0Job.Step0Mapper;
import org.apache.mahout.df.mapred.partial.Step0Job.Step0Output;
-public class Step0JobTest extends TestCase {
+public class Step0JobTest extends MahoutTestCase {
// the generated data must be big enough to be splited by FileInputFormat
@@ -55,12 +54,6 @@
private static final int numMaps = 5;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public void testStep0Mapper() throws Exception {
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step1MapperTest.java Sun Jan 17 19:41:24 2010
@@ -19,11 +19,10 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.Reporter;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.data.Data;
@@ -34,7 +33,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class Step1MapperTest extends TestCase {
+public class Step1MapperTest extends MahoutTestCase {
/**
* Make sure that the data used to build the trees is from the mapper's
@@ -84,12 +83,6 @@
/** nb mappers to use */
protected static final int nbMappers = 2;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public void testMapper() throws Exception {
Long seed = null;
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapred/partial/Step2MapperTest.java Sun Jan 17 19:41:24 2010
@@ -19,8 +19,6 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -28,6 +26,7 @@
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.Reporter;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.DataLoader;
import org.apache.mahout.df.data.Dataset;
@@ -37,7 +36,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class Step2MapperTest extends TestCase {
+public class Step2MapperTest extends MahoutTestCase {
/**
* Special Step2Mapper that can be configured without using a Configuration
@@ -63,12 +62,6 @@
/** nb mappers to use */
protected static final int nbMappers = 5;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
public void testMapper() throws Exception {
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputFormatTest.java Sun Jan 17 19:41:24 2010
@@ -20,22 +20,15 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.mapreduce.Builder;
import org.apache.mahout.df.mapreduce.inmem.InMemInputFormat.InMemInputSplit;
import org.apache.mahout.df.mapreduce.inmem.InMemInputFormat.InMemRecordReader;
-public class InMemInputFormatTest extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
+public class InMemInputFormatTest extends MahoutTestCase {
public void testSplits() throws Exception {
int n = 1;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/inmem/InMemInputSplitTest.java Sun Jan 17 19:41:24 2010
@@ -26,12 +26,11 @@
import java.io.IOException;
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.mapreduce.inmem.InMemInputFormat.InMemInputSplit;
-import junit.framework.TestCase;
-
-public class InMemInputSplitTest extends TestCase {
+public class InMemInputSplitTest extends MahoutTestCase {
protected Random rng;
@@ -40,10 +39,8 @@
@Override
protected void setUp() throws Exception {
- RandomUtils.useTestSeed();
-
+ super.setUp();
rng = RandomUtils.getRandom();
-
byteOutStream = new ByteArrayOutputStream();
out = new DataOutputStream(byteOutStream);
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/InterResultsTest.java Sun Jan 17 19:41:24 2010
@@ -18,18 +18,17 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.Utils;
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class InterResultsTest extends TestCase {
+public class InterResultsTest extends MahoutTestCase {
/** nb attributes per generated data instance */
protected static final int nbAttributes = 4;
@@ -54,7 +53,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
Random rng = RandomUtils.getRandom();
// prepare the data
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartialBuilderTest.java Sun Jan 17 19:41:24 2010
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -32,6 +30,7 @@
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.SequenceFile.Writer;
import org.apache.hadoop.mapreduce.Job;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.DefaultTreeBuilder;
import org.apache.mahout.df.builder.TreeBuilder;
@@ -40,7 +39,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class PartialBuilderTest extends TestCase {
+public class PartialBuilderTest extends MahoutTestCase {
protected static final int numMaps = 5;
@@ -48,12 +47,6 @@
/** instances per partition */
protected static final int numInstances = 20;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testProcessOutput() throws Exception {
Configuration conf = new Configuration();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/PartitionBugTest.java Sun Jan 17 19:41:24 2010
@@ -22,11 +22,10 @@
import java.io.IOException;
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.callback.PredictionCallback;
@@ -37,7 +36,7 @@
import org.apache.mahout.df.data.Utils;
import org.apache.mahout.df.node.Node;
-public class PartitionBugTest extends TestCase {
+public class PartitionBugTest extends MahoutTestCase {
static final int numAttributes = 40;
static final int numInstances = 200;
@@ -45,12 +44,6 @@
static final int numTrees = 10;
static final int numMaps = 5;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
/**
* Make sure that the correct instance ids are being computed
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step0JobTest.java Sun Jan 17 19:41:24 2010
@@ -41,6 +41,7 @@
import org.apache.hadoop.mapreduce.Mapper.Context;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.DataConverter;
import org.apache.mahout.df.data.DataLoader;
@@ -50,7 +51,7 @@
import org.apache.mahout.df.mapreduce.partial.Step0Job.Step0Mapper;
import org.apache.mahout.df.mapreduce.partial.Step0Job.Step0Output;
-public class Step0JobTest extends TestCase {
+public class Step0JobTest extends MahoutTestCase {
// the generated data must be big enough to be splited by FileInputFormat
@@ -58,18 +59,12 @@
static final int numInstances = 2000;
- int numTrees = 10;
+ //int numTrees = 10;
static final int numMaps = 5;
Step0Context context;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
-
/**
* Computes the "mapred.max.split.size" that will generate the desired number
* of input splits
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step1MapperTest.java Sun Jan 17 19:41:24 2010
@@ -19,12 +19,11 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.TaskAttemptID;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.data.Data;
@@ -34,7 +33,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class Step1MapperTest extends TestCase {
+public class Step1MapperTest extends MahoutTestCase {
/**
* Make sure that the data used to build the trees is from the mapper's
@@ -82,12 +81,6 @@
/** nb mappers to use */
protected static final int nbMappers = 2;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testMapper() throws Exception {
Long seed = null;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/Step2MapperTest.java Sun Jan 17 19:41:24 2010
@@ -19,8 +19,6 @@
import java.util.Random;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -28,6 +26,7 @@
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.TaskAttemptID;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.DataLoader;
import org.apache.mahout.df.data.Dataset;
@@ -35,7 +34,7 @@
import org.apache.mahout.df.node.Leaf;
import org.apache.mahout.df.node.Node;
-public class Step2MapperTest extends TestCase {
+public class Step2MapperTest extends MahoutTestCase {
/**
* Special Step2Mapper that can be configured without using a Configuration
@@ -60,12 +59,6 @@
/** nb mappers to use */
protected static final int nbMappers = 5;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testMapper() throws Exception {
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/mapreduce/partial/TreeIDTest.java Sun Jan 17 19:41:24 2010
@@ -19,17 +19,10 @@
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import junit.framework.TestCase;
-
-public class TreeIDTest extends TestCase {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
+public class TreeIDTest extends MahoutTestCase {
public void testTreeID() {
int n = 1000000;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/node/NodeTest.java Sun Jan 17 19:41:24 2010
@@ -26,11 +26,10 @@
import java.io.IOException;
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import junit.framework.TestCase;
-
-public class NodeTest extends TestCase {
+public class NodeTest extends MahoutTestCase {
private Random rng;
@@ -40,8 +39,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- RandomUtils.useTestSeed();
-
rng = RandomUtils.getRandom();
byteOutStream = new ByteArrayOutputStream();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/DefaultIgSplitTest.java Sun Jan 17 19:41:24 2010
@@ -19,23 +19,16 @@
import java.util.Random;
-import junit.framework.TestCase;
-
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.Data;
import org.apache.mahout.df.data.DataLoader;
import org.apache.mahout.df.data.Dataset;
import org.apache.mahout.df.data.Utils;
-public class DefaultIgSplitTest extends TestCase {
+public class DefaultIgSplitTest extends MahoutTestCase {
protected static final int nbAttributes = 10;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testEntropy() throws Exception {
Random rng = RandomUtils.getRandom();
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/df/split/OptIgSplitTest.java Sun Jan 17 19:41:24 2010
@@ -19,23 +19,16 @@
import java.util.Random;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.df.data.Data;
import org.apache.mahout.df.data.Utils;
-import junit.framework.TestCase;
-
-public class OptIgSplitTest extends TestCase {
+public class OptIgSplitTest extends MahoutTestCase {
protected static final int nbAttributes = 20;
protected static final int numInstances = 100;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- RandomUtils.useTestSeed();
- }
public void testComputeSplit() throws Exception {
int n = 100;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/FPGrowthTest.java Sun Jan 17 19:41:24 2010
@@ -25,13 +25,12 @@
import java.util.HashSet;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.fpm.pfpgrowth.convertors.ContextStatusUpdater;
import org.apache.mahout.fpm.pfpgrowth.convertors.SequenceFileOutputCollector;
@@ -39,11 +38,7 @@
import org.apache.mahout.fpm.pfpgrowth.convertors.string.TopKStringPatterns;
import org.apache.mahout.fpm.pfpgrowth.fpgrowth.FPGrowth;
-public class FPGrowthTest extends TestCase {
-
- public FPGrowthTest(String s) {
- super(s);
- }
+public class FPGrowthTest extends MahoutTestCase {
public void testMaxHeapFPGrowth() throws IOException {
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java?rev=900199&r1=900198&r2=900199&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowthTest.java Sun Jan 17 19:41:24 2010
@@ -27,16 +27,15 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.hadoop.conf.Configuration;
+import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.Parameters;
import org.apache.mahout.fpm.pfpgrowth.convertors.string.TopKStringPatterns;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PFPGrowthTest extends TestCase {
+public class PFPGrowthTest extends MahoutTestCase {
private static final Logger log = LoggerFactory.getLogger(PFPGrowthTest.class);