diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java index b7206a0..3a0bd13 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java @@ -31,6 +31,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.BasicOperations; import org.apache.lucene.util.automaton.CharacterRunAutomaton; @@ -44,6 +45,7 @@ import org.apache.lucene.util.automaton.Transition; * Any tests here need to probably consider unicode version of the JRE (it could * cause false fails). */ +@Slow public class TestDuelingAnalyzers extends LuceneTestCase { private CharacterRunAutomaton jvmLetter; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java index 1c82c65..591231c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java @@ -24,10 +24,12 @@ import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.util.LuceneTestCase.Slow; /** * Tests {@link NGramTokenizer} for correctness. */ +@Slow public class NGramTokenizerTest extends BaseTokenStreamTestCase { private StringReader input; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java index 62a458d..f5084c2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java @@ -40,7 +40,9 @@ import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.*; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; +@Slow public class TestSynonymMapFilter extends BaseTokenStreamTestCase { private SynonymMap.Builder b; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java index 2132088..120eafc 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java @@ -30,7 +30,9 @@ import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; +@Slow public class TestExtendedMode extends BaseTokenStreamTestCase { private final Analyzer analyzer = new Analyzer() { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java index c3447e3..400957b 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java @@ -24,10 +24,12 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; +import org.apache.lucene.util.LuceneTestCase.Slow; /** * Test Kuromoji Japanese morphological analyzer */ +@Slow public class TestJapaneseAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the * stopwords file is missing in classpath */ diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java index c87f902..287a4f9 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java @@ -38,7 +38,9 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; +@Slow public class TestJapaneseTokenizer extends BaseTokenStreamTestCase { public static UserDictionary readDict() { diff --git a/lucene/common-build.xml b/lucene/common-build.xml index c77076c..70f218d 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -89,7 +89,7 @@ - + diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java index 80b5d46..b4f282e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java @@ -25,6 +25,7 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.*; import org.apache.lucene.document.*; import org.apache.lucene.index.FieldInfo.IndexOptions; +import org.junit.Ignore; import java.io.IOException; import java.util.ArrayList; @@ -135,7 +136,7 @@ public class Test2BTerms extends LuceneTestCase { } } - @Slow + @Ignore("Very slow. Enable manually by removing @Ignore.") public void test2BTerms() throws IOException { System.out.println("Starting Test2B"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index d1ff8d7..76b67fb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -39,10 +39,12 @@ import org.apache.lucene.util.LineFileDocs; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; /** * MultiThreaded IndexWriter tests */ +@Slow public class TestIndexWriterWithThreads extends LuceneTestCase { // Used by test cases below diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 186bc7a..f7447aa 100755 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java @@ -31,6 +31,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LineFileDocs; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; @@ -40,6 +41,7 @@ import org.apache.lucene.util._TestUtil; * separate norms, addDocument, addIndexes, forceMerge. */ @SuppressCodecs({ "SimpleText", "Memory" }) +@Slow public class TestNorms extends LuceneTestCase { final String byteTestField = "normsTestByte"; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index 6417ebe..27ff14d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -53,6 +53,7 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.LineFileDocs; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; @@ -67,6 +68,7 @@ import org.apache.lucene.util.fst.PairOutputs.Pair; import org.apache.lucene.util.packed.PackedInts; @SuppressCodecs({ "SimpleText", "Memory" }) +@Slow public class TestFSTs extends LuceneTestCase { private MockDirectoryWrapper dir; diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java index 726492f..d9abf3e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java @@ -25,8 +25,10 @@ import java.util.Random; import org.apache.lucene.store.*; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.packed.PackedInts.Reader; +@Slow public class TestPackedInts extends LuceneTestCase { public void testBitsRequired() throws Exception { assertEquals(61, PackedInts.bitsRequired((long)Math.pow(2, 61)-1)); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/AdaptiveAccumulatorTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/AdaptiveAccumulatorTest.java index 6495bc2..7003fbb 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/AdaptiveAccumulatorTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/AdaptiveAccumulatorTest.java @@ -1,6 +1,7 @@ package org.apache.lucene.facet.search; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.facet.search.params.FacetSearchParams; import org.apache.lucene.facet.search.sampling.BaseSampleTestTopK; @@ -24,6 +25,7 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader; * limitations under the License. */ +@Slow public class AdaptiveAccumulatorTest extends BaseSampleTestTopK { @Override diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java index a1b5aa4..eb9af30 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java @@ -1,6 +1,7 @@ package org.apache.lucene.facet.search; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.facet.search.params.FacetSearchParams; import org.apache.lucene.facet.search.sampling.BaseSampleTestTopK; @@ -24,6 +25,7 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader; * limitations under the License. */ +@Slow public class SamplingWrapperTest extends BaseSampleTestTopK { @Override diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/SamplingAccumulatorTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/SamplingAccumulatorTest.java index 73f48b3..cefe4a1 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/SamplingAccumulatorTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/SamplingAccumulatorTest.java @@ -1,6 +1,7 @@ package org.apache.lucene.facet.search.sampling; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.facet.search.FacetsAccumulator; import org.apache.lucene.facet.search.params.FacetSearchParams; @@ -23,6 +24,7 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader; * limitations under the License. */ +@Slow public class SamplingAccumulatorTest extends BaseSampleTestTopK { @Override diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java index 618c4a0..6439770 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java @@ -47,11 +47,13 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.junit.Test; import java.io.IOException; import java.util.*; +@Slow public class TestJoinUtil extends LuceneTestCase { public void testSimple() throws Exception { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java index 9581166..0a4a8b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java @@ -162,15 +162,15 @@ public abstract class LuceneTestCase extends Assert { } /** - * Annotation for tests that are really slow and should be run only when specifically - * asked to run. + * Annotation for tests that are slow. Slow tests do run by default but can be + * disabled if a quick run is needed. */ @Documented @Inherited @Retention(RetentionPolicy.RUNTIME) - @TestGroup(enabled = false, sysProperty = SYSPROP_SLOW) + @TestGroup(enabled = true, sysProperty = SYSPROP_SLOW) public @interface Slow {} - + /** * Annotation for test classes that should avoid certain codec types * (because they are expensive, for example). diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java index 2d484af..ee92123 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.MultiMapSolrParams; @@ -46,6 +47,7 @@ import org.junit.Test; * * */ +@Slow public class UIMAUpdateRequestProcessorTest extends SolrTestCaseJ4 { @BeforeClass diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java index fc9132f..a681b19 100755 --- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java @@ -17,6 +17,7 @@ package org.apache.solr; * limitations under the License. */ +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.response.QueryResponse; @@ -31,6 +32,7 @@ import org.apache.solr.common.util.NamedList; * * @since solr 4.0 */ +@Slow public class TestDistributedGrouping extends BaseDistributedSearchTestCase { String t1="a_t"; diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java index 739f69e..2a3948b 100755 --- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java @@ -24,6 +24,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.lucene.search.FieldCache; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.JettySolrRunner; @@ -43,6 +44,7 @@ import org.apache.solr.common.util.NamedList; * * @since solr 1.3 */ +@Slow public class TestDistributedSearch extends BaseDistributedSearchTestCase { String t1="a_t"; diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java index 7895b06..efa5153 100644 --- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java +++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java @@ -19,6 +19,7 @@ package org.apache.solr; import org.apache.lucene.search.FieldCache; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.SchemaField; @@ -27,6 +28,7 @@ import org.junit.Test; import java.util.*; +@Slow public class TestRandomFaceting extends SolrTestCaseJ4 { public static final String FOO_STRING_FIELD = "foo_s1"; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java index 6240d88..dc7809d 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java @@ -27,11 +27,13 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.util.LuceneTestCase.Slow; /** * */ +@Slow public class TestPhoneticFilterFactory extends BaseTokenStreamTestCase { private static final int REPEATS = 100000; diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java index 66bb42d..ed5b871 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java @@ -34,6 +34,7 @@ import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.JSONTestUtil; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; @@ -61,7 +62,7 @@ import org.apache.solr.util.DefaultSolrThreadFactory; /** * */ -// @LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-2161") +@Slow public class BasicDistributedZkTest extends AbstractDistributedZkTestCase { private static final String DEFAULT_COLLECTION = "collection1"; diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java index c3bf16c..58dd4a1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java @@ -19,6 +19,7 @@ package org.apache.solr.cloud; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogMergePolicy; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; @@ -37,6 +38,7 @@ import org.xml.sax.SAXParseException; * detect if a node is trying to do an update to itself with http - it shouldn't * do that. */ +@Slow public class BasicZkTest extends AbstractZkTestCase { @BeforeClass diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java index 80abfb5..02476c7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.CloudState; import org.apache.solr.common.cloud.Slice; @@ -39,6 +40,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Slow public class CloudStateUpdateTest extends SolrTestCaseJ4 { protected static Logger log = LoggerFactory .getLogger(AbstractZkTestCase.class); diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java index e3a4b54..aec1c5a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java @@ -19,6 +19,7 @@ package org.apache.solr.cloud; import java.io.IOException; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; @@ -42,6 +43,7 @@ import org.junit.BeforeClass; /** * Super basic testing, no shard restarting or anything. */ +@Slow public class FullSolrCloudDistribCmdsTest extends FullSolrCloudTest { diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java index b4ffdeb..d4434e3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java @@ -29,6 +29,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import org.apache.http.params.CoreConnectionPNames; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; @@ -60,6 +61,7 @@ import org.junit.BeforeClass; * what we test now - the default update chain * */ +@Slow public class FullSolrCloudTest extends AbstractDistributedZkTestCase { @BeforeClass public static void beforeFullSolrCloudTest() { diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java index 1c54c95..887c8f2 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import javax.xml.parsers.ParserConfigurationException; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkNodeProps; @@ -42,6 +43,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; +@Slow public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 { protected static Logger log = LoggerFactory .getLogger(AbstractZkTestCase.class); diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java index 24cae92..246a0f2 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.OnReconnect; import org.apache.solr.common.cloud.SolrZkClient; @@ -40,6 +41,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +@Slow public class LeaderElectionTest extends SolrTestCaseJ4 { static final int TIMEOUT = 30000; diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java index 3fa8170..685708d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.CloudState; import org.apache.solr.common.cloud.Slice; @@ -47,6 +48,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +@Slow public class OverseerTest extends SolrTestCaseJ4 { static final int TIMEOUT = 10000; diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java index 18dfd7a..2962697 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java @@ -19,6 +19,7 @@ package org.apache.solr.cloud; import java.io.IOException; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.JettySolrRunner; @@ -28,6 +29,7 @@ import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Slow public class RecoveryZkTest extends FullSolrCloudTest { //private static final String DISTRIB_UPDATE_CHAIN = "distrib-update-chain"; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java index 9bc17f8..2129c0b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java @@ -24,6 +24,7 @@ import java.util.Map; import junit.framework.Assert; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkNodeProps; @@ -35,6 +36,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +@Slow public class ZkControllerTest extends SolrTestCaseJ4 { private static final String COLLECTION_NAME = "collection1"; diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index 9e7ca3b..8d837aa 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.SimpleFSDirectory; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.TestDistributedSearch; @@ -62,6 +63,7 @@ import org.junit.BeforeClass; * @since 1.4 */ // TODO: can this test be sped up? it used to not be so slow... +@Slow public class TestReplicationHandler extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java index d3caad5..e7289b9 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java @@ -20,6 +20,7 @@ package org.apache.solr.handler.component; import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.response.QueryResponse; @@ -34,6 +35,7 @@ import org.apache.solr.common.util.NamedList; * * @see org.apache.solr.handler.component.SpellCheckComponent */ +@Slow public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase { private String requestHandlerName; diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java index 9a1e3da..197a68b 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java @@ -20,6 +20,7 @@ package org.apache.solr.handler.component; import java.io.File; import java.util.*; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; @@ -39,6 +40,7 @@ import org.junit.Test; /** * @since solr 1.3 */ +@Slow public class SpellCheckComponentTest extends SolrTestCaseJ4 { static String rh = "spellCheckCompRH"; diff --git a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java index c120b0c..f845b59 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java +++ b/solr/core/src/test/org/apache/solr/search/TestRealTimeGet.java @@ -26,6 +26,7 @@ import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.noggit.ObjectBuilder; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; @@ -51,6 +52,7 @@ import static org.apache.solr.core.SolrCore.verbose; import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase; +@Slow public class TestRealTimeGet extends SolrTestCaseJ4 { // means we've seen the leader and have version info (i.e. we are a non-leader replica) diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java index 947f76c..ccca7ac 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.GroupParams; @@ -37,6 +38,7 @@ import org.apache.solr.response.SolrQueryResponse; import org.junit.BeforeClass; import org.junit.Test; +@Slow public class SpellCheckCollatorTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { diff --git a/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java index 396d32f..20117a1 100644 --- a/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; @@ -104,6 +105,7 @@ class NewSearcherListener implements SolrEventListener { } } +@Slow public class AutoCommitTest extends AbstractSolrTestCase { @Override diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java index 019e1c7..52d9a52 100644 --- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import org.apache.lucene.util.Constants; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrEventListener; @@ -51,6 +52,7 @@ import org.junit.Before; * * */ +@Slow public class SoftAutoCommitTest extends AbstractSolrTestCase { @Override diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java index 9dfb3c0..d155b78 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java @@ -21,6 +21,7 @@ import junit.framework.Assert; import org.apache.commons.io.FileUtils; import org.apache.http.client.HttpClient; import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.impl.HttpClientUtil; @@ -46,6 +47,7 @@ import java.util.Set; * * @since solr 1.4 */ +@Slow public class TestLBHttpSolrServer extends LuceneTestCase { SolrInstance[] solr = new SolrInstance[3]; HttpClient httpClient; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java index f43e169..2e0a7c5 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java @@ -17,11 +17,13 @@ package org.apache.solr.client.solrj.embedded; * limitations under the License. */ +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.impl.BinaryRequestWriter; import org.apache.solr.client.solrj.impl.BinaryResponseParser; import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer; +@Slow public class SolrExampleStreamingBinaryTest extends SolrExampleStreamingTest { @Override diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java index f9bc499..7999bd7 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java @@ -17,6 +17,7 @@ package org.apache.solr.client.solrj.embedded; +import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrExampleTests; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer; @@ -31,6 +32,7 @@ import org.junit.BeforeClass; * * @since solr 1.3 */ +@Slow public class SolrExampleStreamingTest extends SolrExampleTests { @BeforeClass public static void beforeTest() throws Exception {