honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make base classes tests abstract 

(for intellij)
This commit is contained in:
Shay Banon 2013-07-24 17:28:51 +02:00
parent a3c3d4073b
commit 9f57f26be4
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/java/org/elasticsearch/test/integration/ElasticsearchTestCase.java
View File

@ -21,7 +21,10 @@ package org.elasticsearch.test.integration;
import com.carrotsearch.randomizedtesting.JUnit4MethodProvider; import com.carrotsearch.randomizedtesting.JUnit4MethodProvider;
import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.RandomizedTest;
import com.carrotsearch.randomizedtesting.ThreadFilter; import com.carrotsearch.randomizedtesting.ThreadFilter;
import com.carrotsearch.randomizedtesting.annotations.*; import com.carrotsearch.randomizedtesting.annotations.Listeners;
import com.carrotsearch.randomizedtesting.annotations.TestMethodProviders;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
import org.apache.lucene.util.LuceneJUnit3MethodProvider; import org.apache.lucene.util.LuceneJUnit3MethodProvider;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
@ -30,34 +33,35 @@ import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.junit.listerners.ReproduceInfoPrinter; import org.elasticsearch.junit.listerners.ReproduceInfoPrinter;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@TestMethodProviders({ @TestMethodProviders({
LuceneJUnit3MethodProvider.class, LuceneJUnit3MethodProvider.class,
JUnit4MethodProvider.class JUnit4MethodProvider.class
}) })
@Listeners({ @Listeners({
ReproduceInfoPrinter.class ReproduceInfoPrinter.class
}) })
@ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchTestCase.ElasticSearchThreadFilter.class}) @ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchTestCase.ElasticSearchThreadFilter.class})
@ThreadLeakScope(Scope.NONE) @ThreadLeakScope(Scope.NONE)
@RunWith(value = com.carrotsearch.randomizedtesting.RandomizedRunner.class) @RunWith(value = com.carrotsearch.randomizedtesting.RandomizedRunner.class)
public class ElasticsearchTestCase extends RandomizedTest { public abstract class ElasticsearchTestCase extends RandomizedTest {
public static final Version TEST_VERSION_CURRENT = LuceneTestCase.TEST_VERSION_CURRENT; public static final Version TEST_VERSION_CURRENT = LuceneTestCase.TEST_VERSION_CURRENT;
protected final ESLogger logger = Loggers.getLogger(getClass()); protected final ESLogger logger = Loggers.getLogger(getClass());
public static final boolean NIGHLY = Boolean.parseBoolean(System.getProperty("es.tests.nighly", "false")); // disabled by default public static final boolean NIGHLY = Boolean.parseBoolean(System.getProperty("es.tests.nighly", "false")); // disabled by default
public static final String CHILD_VM_ID = System.getProperty("junit4.childvm.id", "" + System.currentTimeMillis()); public static final String CHILD_VM_ID = System.getProperty("junit4.childvm.id", "" + System.currentTimeMillis());
public static final String SYSPROP_BADAPPLES = "tests.badapples"; public static final String SYSPROP_BADAPPLES = "tests.badapples";
public static class ElasticSearchThreadFilter implements ThreadFilter { public static class ElasticSearchThreadFilter implements ThreadFilter {
@Override @Override
public boolean reject(Thread t) { public boolean reject(Thread t) {
return true; return true;
} }
} }
} }

3
src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java
View File

@ -27,9 +27,8 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
/** /**
* *
*/ */
public class AbstractZenNodesTests extends AbstractNodesTests { public abstract class AbstractZenNodesTests extends AbstractNodesTests {
@Override @Override
protected final Settings getClassDefaultSettings() { protected final Settings getClassDefaultSettings() {
// we force zen discovery here since it has specific handling for specific master / data nodes // we force zen discovery here since it has specific handling for specific master / data nodes