diff options
author | Ryan Ernst <ryan@iernst.net> | 2015-08-03 17:43:00 -0700 |
---|---|---|
committer | Ryan Ernst <ryan@iernst.net> | 2015-08-03 17:43:00 -0700 |
commit | 1e12d03252590bb44ae0cc3771c82c63730de212 (patch) | |
tree | a699635b3946b5541aeeaf9b0c0adcbeeeb62077 /core/src/test/java/org/elasticsearch/versioning | |
parent | 3c5b43a5bd426e4e1b041de31a0f7051081b3921 (diff) |
Tests: Rename base tests cases to use "TestCase" suffix
Most of the abstract base test classes we have were previously @Ignored.
However, there were also some other tests ignored. Having two ways to
quiet tests is confusing, and clearly it has caused some tests
to get lost in the fold.
This change moves all base test classes to use the "TestCase" suffix,
which is not picked up by the test class name pattern. It also removes
@Ignore from (almost) all tests, and adds it to forbidden apis.
And since we were renaming, I shorted base test class names to use
"ES" instead of "Elasticsearch". I type this a lot of types a day,
and I have heard others express a similar desire for a shorter name.
closes #10659
Diffstat (limited to 'core/src/test/java/org/elasticsearch/versioning')
-rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java | 4 | ||||
-rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index 8edf2f2335..402ec0d8dc 100644 --- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.versioning; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Map; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ConcurrentDocumentOperationIT extends ElasticsearchIntegrationTest { +public class ConcurrentDocumentOperationIT extends ESIntegTestCase { @Test public void concurrentOperationOnSameDocTest() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index a1cec0cbad..5296e763cc 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentAlreadyExistsException; import org.elasticsearch.index.engine.FlushNotAllowedEngineException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class SimpleVersioningIT extends ElasticsearchIntegrationTest { +public class SimpleVersioningIT extends ESIntegTestCase { @Test public void testExternalVersioningInitialDelete() throws Exception { |