From ca6f6d42838bb36ba48d54afe8f5b43e9df03af5 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 7 Apr 2015 16:56:52 +0200 Subject: [PATCH] Tests: work-around for LUCENE-6406. --- .../elasticsearch/test/ElasticsearchLuceneTestCase.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java index 4273cfa2f90..c106b853c68 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java @@ -25,12 +25,15 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; + import org.apache.lucene.codecs.Codec; +import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.util.TimeUnits; import org.elasticsearch.test.junit.listeners.LoggingListener; import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; +import org.junit.AfterClass; /** @@ -66,4 +69,10 @@ public abstract class ElasticsearchLuceneTestCase extends LuceneTestCase { public static int scaledRandomIntBetween(int min, int max) { return RandomizedTest.scaledRandomIntBetween(min, max); } + + @AfterClass + public static void clearDefaultQueryCache() { + // TODO: remove me when https://issues.apache.org/jira/browse/LUCENE-6406 is fixed + IndexSearcher.setDefaultQueryCache(null); + } }