honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13282 from rjernst/no_test_exclusions

Browse Source 
Remove test class exclusion for Abstract prefix and rename classes accordingly
This commit is contained in:
Ryan Ernst 2015-09-02 11:13:30 -07:00
commit e3304a19af
40 changed files with 99 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
View File

@ -28,6 +28,7 @@ import org.elasticsearch.action.RoutingMissingException;
import org.elasticsearch.action.TimestampParsingException;
import org.elasticsearch.action.search.SearchPhaseExecutionException;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.client.AbstractClientHeadersTestCase;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.metadata.SnapshotId;
import org.elasticsearch.cluster.node.DiscoveryNode;
@ -78,7 +79,6 @@ import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@ -97,7 +97,7 @@ public class ExceptionSerializationTests extends ESTestCase {
org.elasticsearch.test.rest.client.RestException.class,
org.elasticsearch.common.util.CancellableThreadsTest.CustomException.class,
org.elasticsearch.rest.BytesRestResponseTests.WithHeadersException.class,
org.elasticsearch.client.AbstractClientHeadersTests.InternalException.class);
AbstractClientHeadersTestCase.InternalException.class);
FileVisitor<Path> visitor = new FileVisitor<Path>() {
private Path pkgPrefix = PathUtils.get(path).getParent();

78
core/src/test/java/org/elasticsearch/NamingConventionTests.java
View File

@ -53,6 +53,8 @@ public class NamingConventionTests extends ESTestCase {
final Set<Class> pureUnitTest = new HashSet<>();
final Set<Class> missingSuffix = new HashSet<>();
final Set<Class> integTestsInDisguise = new HashSet<>();
final Set<Class> notRunnable = new HashSet<>();
final Set<Class> innerClasses = new HashSet<>();
String[] packages = {"org.elasticsearch", "org.apache.lucene"};
for (final String packageName : packages) {
final String path = "/" + packageName.replace('.', '/');
@ -76,28 +78,31 @@ public class NamingConventionTests extends ESTestCase {
String filename = file.getFileName().toString();
if (filename.endsWith(".class")) {
Class<?> clazz = loadClass(filename);
if (Modifier.isAbstract(clazz.getModifiers()) == false && Modifier.isInterface(clazz.getModifiers()) == false) {
if (clazz.getName().endsWith("Tests") ||
clazz.getName().endsWith("Test")) { // don't worry about the ones that match the pattern
if (clazz.getName().endsWith("Tests") ||
clazz.getName().endsWith("Test")) { // don't worry about the ones that match the pattern
if (ESIntegTestCase.class.isAssignableFrom(clazz)) {
integTestsInDisguise.add(clazz);
}
if (isTestCase(clazz) == false) {
notImplementing.add(clazz);
}
} else if (clazz.getName().endsWith("IT")) {
if (isTestCase(clazz) == false) {
notImplementing.add(clazz);
}
// otherwise fine
} else if (isTestCase(clazz)) {
if (ESIntegTestCase.class.isAssignableFrom(clazz)) {
integTestsInDisguise.add(clazz);
}
if (Modifier.isAbstract(clazz.getModifiers()) || Modifier.isInterface(clazz.getModifiers())) {
notRunnable.add(clazz);
} else if (isTestCase(clazz) == false) {
notImplementing.add(clazz);
} else if (Modifier.isStatic(clazz.getModifiers())) {
innerClasses.add(clazz);
}
} else if (clazz.getName().endsWith("IT")) {
if (isTestCase(clazz) == false) {
notImplementing.add(clazz);
}
// otherwise fine
} else if (Modifier.isAbstract(clazz.getModifiers()) == false && Modifier.isInterface(clazz.getModifiers()) == false) {
if (isTestCase(clazz)) {
missingSuffix.add(clazz);
} else if (junit.framework.Test.class.isAssignableFrom(clazz) || hasTestAnnotation(clazz)) {
pureUnitTest.add(clazz);
}
}
}
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
@ -143,39 +148,50 @@ public class NamingConventionTests extends ESTestCase {
}
assertTrue(missingSuffix.remove(WrongName.class));
assertTrue(missingSuffix.remove(WrongNameTheSecond.class));
assertTrue(notRunnable.remove(DummyAbstractTests.class));
assertTrue(notRunnable.remove(DummyInterfaceTests.class));
assertTrue(innerClasses.remove(InnerTests.class));
assertTrue(notImplementing.remove(NotImplementingTests.class));
assertTrue(notImplementing.remove(NotImplementingTest.class));
assertTrue(pureUnitTest.remove(PlainUnit.class));
assertTrue(pureUnitTest.remove(PlainUnitTheSecond.class));
String classesToSubclass = Joiner.on(',').join(
ESTestCase.class.getSimpleName(),
ESTestCase.class.getSimpleName(),
ESTokenStreamTestCase.class.getSimpleName(),
LuceneTestCase.class.getSimpleName());
ESTestCase.class.getSimpleName(),
ESTestCase.class.getSimpleName(),
ESTokenStreamTestCase.class.getSimpleName(),
LuceneTestCase.class.getSimpleName());
assertTrue("Not all subclasses of " + ESTestCase.class.getSimpleName() +
" match the naming convention. Concrete classes must end with [Test|Tests]: " + missingSuffix.toString(),
missingSuffix.isEmpty());
assertTrue("Pure Unit-Test found must subclass one of [" + classesToSubclass +"] " + pureUnitTest.toString(),
pureUnitTest.isEmpty());
assertTrue("Classes ending with Test|Tests] must subclass [" + classesToSubclass +"] " + notImplementing.toString(),
notImplementing.isEmpty());
assertTrue("Subclasses of ESIntegTestCase should end with IT as they are integration tests: " + integTestsInDisguise, integTestsInDisguise.isEmpty());
" match the naming convention. Concrete classes must end with [Test|Tests]:\n" + Joiner.on('\n').join(missingSuffix),
missingSuffix.isEmpty());
assertTrue("Classes ending with [Test|Tests] are abstract or interfaces:\n" + Joiner.on('\n').join(notRunnable),
notRunnable.isEmpty());
assertTrue("Found inner classes that are tests, which are excluded from the test runner:\n" + Joiner.on('\n').join(innerClasses),
innerClasses.isEmpty());
assertTrue("Pure Unit-Test found must subclass one of [" + classesToSubclass +"]:\n" + Joiner.on('\n').join(pureUnitTest),
pureUnitTest.isEmpty());
assertTrue("Classes ending with Test|Tests] must subclass [" + classesToSubclass +"]:\n" + Joiner.on('\n').join(notImplementing),
notImplementing.isEmpty());
assertTrue("Subclasses of ESIntegTestCase should end with IT as they are integration tests:\n" + Joiner.on('\n').join(integTestsInDisguise),
integTestsInDisguise.isEmpty());
}
/*
* Some test the test classes
*/
@SuppressForbidden(reason = "Ignoring test the tester")
@Ignore
public static final class NotImplementingTests {}
@SuppressForbidden(reason = "Ignoring test the tester")
@Ignore
public static final class NotImplementingTest {}
public static final class WrongName extends ESTestCase {}
public static abstract class DummyAbstractTests extends ESTestCase {}
public interface DummyInterfaceTests {}
public static final class InnerTests extends ESTestCase {}
public static final class WrongNameTheSecond extends ESTestCase {}
public static final class PlainUnit extends TestCase {}

2
core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java → core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java
View File

@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public abstract class AbstractClientHeadersTests extends ESTestCase {
public abstract class AbstractClientHeadersTestCase extends ESTestCase {
protected static final Settings HEADER_SETTINGS = Settings.builder()
.put(Headers.PREFIX + ".key1", "val1")

4
core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.GenericAction;
import org.elasticsearch.action.support.ActionFilter;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.TransportAction;
import org.elasticsearch.client.AbstractClientHeadersTests;
import org.elasticsearch.client.AbstractClientHeadersTestCase;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.common.settings.Settings;
@ -37,7 +37,7 @@ import java.util.HashMap;
/**
*
*/
public class NodeClientHeadersTests extends AbstractClientHeadersTests {
public class NodeClientHeadersTests extends AbstractClientHeadersTestCase {
private static final ActionFilters EMPTY_FILTERS = new ActionFilters(Collections.<ActionFilter>emptySet());

5
core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.node.liveness.LivenessResponse;
import org.elasticsearch.action.admin.cluster.node.liveness.TransportLivenessAction;
import org.elasticsearch.action.admin.cluster.state.ClusterStateAction;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.client.AbstractClientHeadersTests;
import org.elasticsearch.client.AbstractClientHeadersTestCase;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState;
@ -48,7 +48,6 @@ import org.elasticsearch.transport.TransportResponseHandler;
import org.elasticsearch.transport.TransportService;
import org.junit.Test;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@ -58,7 +57,7 @@ import static org.hamcrest.Matchers.is;
/**
*
*/
public class TransportClientHeadersTests extends AbstractClientHeadersTests {
public class TransportClientHeadersTests extends AbstractClientHeadersTestCase {
private static final LocalTransportAddress address = new LocalTransportAddress("test");

4
core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java → core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTestCase.java
View File

@ -37,11 +37,11 @@ import java.util.concurrent.CountDownLatch;
/**
* Test streaming compression (e.g. used for recovery)
*/
public abstract class AbstractCompressedStreamTests extends ESTestCase {
public abstract class AbstractCompressedStreamTestCase extends ESTestCase {
private final Compressor compressor;
protected AbstractCompressedStreamTests(Compressor compressor) {
protected AbstractCompressedStreamTestCase(Compressor compressor) {
this.compressor = compressor;
}

4
core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java → core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTestCase.java
View File

@ -35,11 +35,11 @@ import static org.hamcrest.Matchers.not;
/**
*
*/
public abstract class AbstractCompressedXContentTests extends ESTestCase {
public abstract class AbstractCompressedXContentTestCase extends ESTestCase {
private final Compressor compressor;
protected AbstractCompressedXContentTests(Compressor compressor) {
protected AbstractCompressedXContentTestCase(Compressor compressor) {
this.compressor = compressor;
}

4
core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.common.compress.deflate;
import org.elasticsearch.common.compress.AbstractCompressedStreamTests;
import org.elasticsearch.common.compress.AbstractCompressedStreamTestCase;
public class DeflateCompressedStreamTests extends AbstractCompressedStreamTests {
public class DeflateCompressedStreamTests extends AbstractCompressedStreamTestCase {
public DeflateCompressedStreamTests() {
super(new DeflateCompressor());

4
core/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.common.compress.deflate;
import org.elasticsearch.common.compress.AbstractCompressedXContentTests;
import org.elasticsearch.common.compress.AbstractCompressedXContentTestCase;
public class DeflateXContentTests extends AbstractCompressedXContentTests {
public class DeflateXContentTests extends AbstractCompressedXContentTestCase {
public DeflateXContentTests() {
super(new DeflateCompressor());

4
core/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.common.compress.lzf;
import org.elasticsearch.common.compress.AbstractCompressedStreamTests;
import org.elasticsearch.common.compress.AbstractCompressedStreamTestCase;
public class LZFCompressedStreamTests extends AbstractCompressedStreamTests {
public class LZFCompressedStreamTests extends AbstractCompressedStreamTestCase {
public LZFCompressedStreamTests() {
super(new LZFTestCompressor());

4
core/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.common.compress.lzf;
import org.elasticsearch.common.compress.AbstractCompressedXContentTests;
import org.elasticsearch.common.compress.AbstractCompressedXContentTestCase;
public class LZFXContentTests extends AbstractCompressedXContentTests {
public class LZFXContentTests extends AbstractCompressedXContentTestCase {
public LZFXContentTests() {
super(new LZFTestCompressor());

2
core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java → core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java
View File

@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public abstract class AbstractRecyclerTests extends ESTestCase {
public abstract class AbstractRecyclerTestCase extends ESTestCase {
// marker states for data
protected static final byte FRESH = 1;

2
core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.recycler;
public class ConcurrentRecyclerTests extends AbstractRecyclerTests {
public class ConcurrentRecyclerTests extends AbstractRecyclerTestCase {
@Override
protected Recycler<byte[]> newRecycler(int limit) {

2
core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.recycler;
public class LockedRecyclerTests extends AbstractRecyclerTests {
public class LockedRecyclerTests extends AbstractRecyclerTestCase {
@Override
protected Recycler<byte[]> newRecycler(int limit) {

2
core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.recycler;
public class NoneRecyclerTests extends AbstractRecyclerTests {
public class NoneRecyclerTests extends AbstractRecyclerTestCase {
@Override
protected Recycler<byte[]> newRecycler(int limit) {

2
core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.recycler;
public class QueueRecyclerTests extends AbstractRecyclerTests {
public class QueueRecyclerTests extends AbstractRecyclerTestCase {
@Override
protected Recycler<byte[]> newRecycler(int limit) {

2
core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java → core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTestCase.java
View File

@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
public abstract class AbstractFilteringJsonGeneratorTests extends ESTestCase {
public abstract class AbstractFilteringJsonGeneratorTestCase extends ESTestCase {
protected abstract XContentType getXContentType();

2
core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.common.xcontent.support.filtering;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType;
public class JsonFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTests {
public class JsonFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTestCase {
@Override
protected XContentType getXContentType() {

2
core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.common.xcontent.support.filtering;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType;
public class YamlFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTests {
public class YamlFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTestCase {
@Override
protected XContentType getXContentType() {

3
core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java → core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java
View File

@ -24,13 +24,12 @@ import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.search.*;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.Strings;
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
import org.elasticsearch.search.MultiValueMode;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
public abstract class AbstractFieldDataImplTests extends AbstractFieldDataTests {
public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTestCase {
protected String one() {
return "1";

2
core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java → core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java
View File

@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.sameInstance;
public abstract class AbstractFieldDataTests extends ESSingleNodeTestCase {
public abstract class AbstractFieldDataTestCase extends ESSingleNodeTestCase {
protected IndexService indexService;
protected IndexFieldDataService ifdService;

2
core/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java → core/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTestCase.java
View File

@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public abstract class AbstractNumericFieldDataTests extends AbstractFieldDataImplTests {
public abstract class AbstractNumericFieldDataTestCase extends AbstractFieldDataImplTestCase {
@Override
protected abstract FieldDataType getFieldDataType();

2
core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java → core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java
View File

@ -70,7 +70,7 @@ import static org.hamcrest.Matchers.sameInstance;
/**
*/
public abstract class AbstractStringFieldDataTests extends AbstractFieldDataImplTests {
public abstract class AbstractStringFieldDataTestCase extends AbstractFieldDataImplTestCase {
private void addField(Document d, String name, String value) {
d.add(new StringField(name, value, Field.Store.YES));

2
core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java
View File

@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class BinaryDVFieldDataTests extends AbstractFieldDataTests {
public class BinaryDVFieldDataTests extends AbstractFieldDataTestCase {
@Override
protected boolean hasDocValues() {

2
core/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java
View File

@ -27,7 +27,7 @@ import org.apache.lucene.index.Term;
/**
*/
public class DoubleFieldDataTests extends AbstractNumericFieldDataTests {
public class DoubleFieldDataTests extends AbstractNumericFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/fielddata/DuelFieldDataTests.java
View File

@ -56,7 +56,7 @@ import java.util.Set;
import static org.hamcrest.Matchers.*;
public class DuelFieldDataTests extends AbstractFieldDataTests {
public class DuelFieldDataTests extends AbstractFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java
View File

@ -30,7 +30,7 @@ import java.util.Random;
import static org.hamcrest.Matchers.equalTo;
public class FilterFieldDataTest extends AbstractFieldDataTests {
public class FilterFieldDataTest extends AbstractFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java
View File

@ -26,7 +26,7 @@ import org.apache.lucene.index.Term;
/**
*/
public class FloatFieldDataTests extends AbstractNumericFieldDataTests {
public class FloatFieldDataTests extends AbstractNumericFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java
View File

@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.lessThan;
/**
* Tests for all integer types (byte, short, int, long).
*/
public class LongFieldDataTests extends AbstractNumericFieldDataTests {
public class LongFieldDataTests extends AbstractNumericFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
/**
*/
public class PagedBytesStringFieldDataTests extends AbstractStringFieldDataTests {
public class PagedBytesStringFieldDataTests extends AbstractStringFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

3
core/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
View File

@ -30,7 +30,6 @@ import org.apache.lucene.search.*;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
import org.elasticsearch.index.fielddata.plain.ParentChildIndexFieldData;
import org.elasticsearch.index.mapper.Uid;
import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
@ -49,7 +48,7 @@ import static org.hamcrest.Matchers.nullValue;
/**
*/
public class ParentChildFieldDataTests extends AbstractFieldDataTests {
public class ParentChildFieldDataTests extends AbstractFieldDataTestCase {
private final String parentType = "parent";
private final String childType = "child";

2
core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.index.fielddata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
public class SortedSetDVStringFieldDataTests extends AbstractStringFieldDataTests {
public class SortedSetDVStringFieldDataTests extends AbstractStringFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

4
core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java → core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java
View File

@ -40,7 +40,7 @@ import org.apache.lucene.search.join.BitDocIdSetCachingWrapperFilter;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.index.fielddata.AbstractFieldDataTests;
import org.elasticsearch.index.fielddata.AbstractFieldDataTestCase;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public abstract class AbstractNumberNestedSortingTests extends AbstractFieldDataTests {
public abstract class AbstractNumberNestedSortingTestCase extends AbstractFieldDataTestCase {
@Test
public void testNestedSorting() throws Exception {

2
core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java
View File

@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public class DoubleNestedSortingTests extends AbstractNumberNestedSortingTests {
public class DoubleNestedSortingTests extends AbstractNumberNestedSortingTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.search.MultiValueMode;
/**
*/
public class LongNestedSortingTests extends AbstractNumberNestedSortingTests {
public class LongNestedSortingTests extends AbstractNumberNestedSortingTestCase {
@Override
protected FieldDataType getFieldDataType() {

4
core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java
View File

@ -46,7 +46,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TestUtil;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.fielddata.AbstractFieldDataTests;
import org.elasticsearch.index.fielddata.AbstractFieldDataTestCase;
import org.elasticsearch.index.fielddata.FieldDataType;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public class NestedSortingTests extends AbstractFieldDataTests {
public class NestedSortingTests extends AbstractFieldDataTestCase {
@Override
protected FieldDataType getFieldDataType() {

2
core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java → core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java
View File

@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public abstract class AbstractSimpleTransportTests extends ESTestCase {
public abstract class AbstractSimpleTransportTestCase extends ESTestCase {
protected ThreadPool threadPool;

4
core/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java
View File

@ -23,9 +23,9 @@ import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.transport.AbstractSimpleTransportTests;
import org.elasticsearch.transport.AbstractSimpleTransportTestCase;
public class SimpleLocalTransportTests extends AbstractSimpleTransportTests {
public class SimpleLocalTransportTests extends AbstractSimpleTransportTestCase {
@Override
protected MockTransportService build(Settings settings, Version version, NamedWriteableRegistry namedWriteableRegistry) {

4
core/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java
View File

@ -27,14 +27,14 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.transport.AbstractSimpleTransportTests;
import org.elasticsearch.transport.AbstractSimpleTransportTestCase;
import org.elasticsearch.transport.ConnectTransportException;
import org.junit.Test;
import java.net.InetAddress;
import java.net.UnknownHostException;
public class SimpleNettyTransportTests extends AbstractSimpleTransportTests {
public class SimpleNettyTransportTests extends AbstractSimpleTransportTestCase {
@Override
protected MockTransportService build(Settings settings, Version version, NamedWriteableRegistry namedWriteableRegistry) {

2
pom.xml
View File

@ -719,7 +719,7 @@
<include>**/*Test.class</include>
</includes>
<excludes>
<exclude>**/Abstract*.class</exclude>
<exclude>**/*$*.class</exclude>
<exclude>**/*StressTest.class</exclude>
</excludes>
</configuration>