From cbac28178737b0228fb94ceec2fb4e031077874f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 11 Apr 2018 21:16:47 +0200 Subject: [PATCH] Rename EsTester factory methods --- .../org/sonar/server/authentication/SsoAuthenticatorTest.java | 2 +- .../server/authentication/UserIdentityAuthenticatorTest.java | 2 +- .../java/org/sonar/server/branch/pr/ws/ListActionTest.java | 2 +- .../test/java/org/sonar/server/branch/ws/ListActionTest.java | 2 +- .../server/component/index/ComponentIndexSearchTest.java | 2 +- .../org/sonar/server/component/index/ComponentIndexTest.java | 2 +- .../sonar/server/component/index/ComponentIndexerTest.java | 2 +- .../java/org/sonar/server/component/ws/SearchActionTest.java | 2 +- .../sonar/server/component/ws/SearchProjectsActionTest.java | 2 +- .../org/sonar/server/component/ws/SuggestionsActionTest.java | 2 +- .../projectanalysis/issue/ScmAccountToUserLoaderTest.java | 2 +- .../src/test/java/org/sonar/server/es/BulkIndexerTest.java | 2 +- .../src/test/java/org/sonar/server/es/EsClientTest.java | 2 +- .../src/test/java/org/sonar/server/es/EsTester.java | 4 ++-- .../src/test/java/org/sonar/server/es/IndexCreatorTest.java | 2 +- .../test/java/org/sonar/server/es/IndexerStartupTaskTest.java | 2 +- .../server/es/OneToManyResilientIndexingListenerTest.java | 2 +- .../server/es/OneToOneResilientIndexingListenerTest.java | 2 +- .../test/java/org/sonar/server/es/RecoveryIndexerTest.java | 2 +- .../sonar/server/es/metadata/EsDbCompatibilityImplTest.java | 2 +- .../java/org/sonar/server/es/metadata/MetadataIndexTest.java | 2 +- .../sonar/server/es/request/ProxyBulkRequestBuilderTest.java | 2 +- .../server/es/request/ProxyClearCacheRequestBuilderTest.java | 2 +- .../server/es/request/ProxyCreateIndexRequestBuilderTest.java | 2 +- .../server/es/request/ProxyDeleteRequestBuilderTest.java | 2 +- .../sonar/server/es/request/ProxyFlushRequestBuilderTest.java | 2 +- .../sonar/server/es/request/ProxyGetRequestBuilderTest.java | 2 +- .../sonar/server/es/request/ProxyIndexRequestBuilderTest.java | 2 +- .../es/request/ProxyIndicesExistsRequestBuilderTest.java | 2 +- .../es/request/ProxyIndicesStatsRequestBuilderTest.java | 2 +- .../server/es/request/ProxyMultiGetRequestBuilderTest.java | 2 +- .../server/es/request/ProxyNodesStatsRequestBuilderTest.java | 2 +- .../server/es/request/ProxyPutMappingRequestBuilderTest.java | 2 +- .../server/es/request/ProxyRefreshRequestBuilderTest.java | 2 +- .../server/es/request/ProxySearchRequestBuilderTest.java | 2 +- .../es/request/ProxySearchScrollRequestBuilderTest.java | 2 +- .../es/request/ProxyWebServerHealthRequestBuilderTest.java | 2 +- .../es/request/ProxyWebServerStateRequestBuilderTest.java | 2 +- .../es/request/ProxyWebServerStatsRequestBuilderTest.java | 2 +- .../org/sonar/server/health/EsStatusClusterCheckTest.java | 2 +- .../java/org/sonar/server/health/EsStatusNodeCheckTest.java | 2 +- .../test/java/org/sonar/server/issue/IssueUpdaterTest.java | 2 +- .../java/org/sonar/server/issue/index/IssueIndexDebtTest.java | 2 +- .../server/issue/index/IssueIndexProjectStatisticsTest.java | 2 +- .../java/org/sonar/server/issue/index/IssueIndexTest.java | 2 +- .../java/org/sonar/server/issue/index/IssueIndexerTest.java | 2 +- .../java/org/sonar/server/issue/ws/AddCommentActionTest.java | 2 +- .../test/java/org/sonar/server/issue/ws/AssignActionTest.java | 2 +- .../java/org/sonar/server/issue/ws/AuthorsActionTest.java | 2 +- .../java/org/sonar/server/issue/ws/BulkChangeActionTest.java | 2 +- .../org/sonar/server/issue/ws/DoTransitionActionTest.java | 2 +- .../org/sonar/server/issue/ws/SearchActionComponentsTest.java | 2 +- .../test/java/org/sonar/server/issue/ws/SearchActionTest.java | 2 +- .../java/org/sonar/server/issue/ws/SetSeverityActionTest.java | 2 +- .../java/org/sonar/server/issue/ws/SetTagsActionTest.java | 2 +- .../java/org/sonar/server/issue/ws/SetTypeActionTest.java | 2 +- .../test/java/org/sonar/server/issue/ws/TagsActionTest.java | 2 +- .../org/sonar/server/measure/custom/ws/CreateActionTest.java | 2 +- .../org/sonar/server/measure/custom/ws/MetricsActionTest.java | 2 +- .../org/sonar/server/measure/custom/ws/SearchActionTest.java | 2 +- .../org/sonar/server/measure/custom/ws/UpdateActionTest.java | 2 +- .../sonar/server/measure/index/ProjectMeasuresIndexTest.java | 2 +- .../measure/index/ProjectMeasuresIndexTextSearchTest.java | 2 +- .../server/measure/index/ProjectMeasuresIndexerTest.java | 2 +- .../server/organization/OrganizationCreationImplTest.java | 2 +- .../org/sonar/server/organization/ws/AddMemberActionTest.java | 2 +- .../org/sonar/server/organization/ws/CreateActionTest.java | 2 +- .../org/sonar/server/organization/ws/DeleteActionTest.java | 2 +- .../sonar/server/organization/ws/EnableSupportActionTest.java | 2 +- .../sonar/server/organization/ws/RemoveMemberActionTest.java | 2 +- .../sonar/server/organization/ws/SearchMembersActionTest.java | 2 +- .../sonar/server/permission/index/PermissionIndexerTest.java | 2 +- .../org/sonar/server/permission/ws/BasePermissionWsTest.java | 2 +- .../java/org/sonar/server/platform/BackendCleanupTest.java | 2 +- .../server/platform/monitoring/EsIndexesSectionTest.java | 2 +- .../sonar/server/platform/monitoring/EsStateSectionTest.java | 2 +- .../monitoring/cluster/EsClusterStateSectionTest.java | 2 +- .../monitoring/cluster/SearchNodesInfoLoaderImplTest.java | 2 +- .../org/sonar/server/project/ws/BulkUpdateKeyActionTest.java | 2 +- .../sonar/server/project/ws/UpdateVisibilityActionTest.java | 2 +- .../java/org/sonar/server/projecttag/ws/SearchActionTest.java | 2 +- .../sonar/server/qualityprofile/QProfileComparisonTest.java | 2 +- .../org/sonar/server/qualityprofile/QProfileRuleImplTest.java | 2 +- .../org/sonar/server/qualityprofile/QProfileTreeImplTest.java | 2 +- .../server/qualityprofile/index/ActiveRuleIndexerTest.java | 2 +- .../server/qualityprofile/ws/ChangeParentActionTest.java | 2 +- .../org/sonar/server/qualityprofile/ws/CreateActionTest.java | 2 +- .../sonar/server/qualityprofile/ws/InheritanceActionTest.java | 2 +- .../sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java | 2 +- .../org/sonar/server/qualityprofile/ws/ShowActionTest.java | 2 +- .../test/java/org/sonar/server/rule/RegisterRulesTest.java | 2 +- .../src/test/java/org/sonar/server/rule/RuleCreatorTest.java | 2 +- .../src/test/java/org/sonar/server/rule/RuleUpdaterTest.java | 2 +- .../org/sonar/server/rule/index/RuleIndexDefinitionTest.java | 2 +- .../test/java/org/sonar/server/rule/index/RuleIndexTest.java | 2 +- .../java/org/sonar/server/rule/index/RuleIndexerTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/CreateActionTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/DeleteActionTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/SearchActionTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/ShowActionTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/TagsActionTest.java | 2 +- .../test/java/org/sonar/server/rule/ws/UpdateActionTest.java | 2 +- .../java/org/sonar/server/telemetry/TelemetryDaemonTest.java | 2 +- .../test/java/org/sonar/server/test/index/TestIndexTest.java | 2 +- .../java/org/sonar/server/test/index/TestIndexerTest.java | 2 +- .../java/org/sonar/server/test/ws/CoveredFilesActionTest.java | 2 +- .../test/java/org/sonar/server/test/ws/ListActionTest.java | 2 +- .../java/org/sonar/server/user/UserUpdaterCreateTest.java | 2 +- .../java/org/sonar/server/user/UserUpdaterUpdateTest.java | 2 +- .../test/java/org/sonar/server/user/index/UserIndexTest.java | 2 +- .../java/org/sonar/server/user/index/UserIndexerTest.java | 2 +- .../org/sonar/server/user/ws/ChangePasswordActionTest.java | 2 +- .../test/java/org/sonar/server/user/ws/CreateActionTest.java | 2 +- .../java/org/sonar/server/user/ws/DeactivateActionTest.java | 2 +- .../test/java/org/sonar/server/user/ws/SearchActionTest.java | 2 +- .../test/java/org/sonar/server/user/ws/UpdateActionTest.java | 2 +- .../test/java/org/sonar/server/view/index/ViewIndexTest.java | 2 +- .../java/org/sonar/server/view/index/ViewIndexerTest.java | 2 +- 118 files changed, 119 insertions(+), 119 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java index 431f2933e30..0ecfe073c68 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java @@ -73,7 +73,7 @@ public class SsoAuthenticatorTest { @Rule public DbTester db = DbTester.create(new AlwaysIncreasingSystem2()); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private static final String DEFAULT_LOGIN = "john"; private static final String DEFAULT_NAME = "John"; diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java index e037b5b110b..e4a13809c3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java @@ -79,7 +79,7 @@ public class UserIdentityAuthenticatorTest { @Rule public DbTester db = DbTester.create(new AlwaysIncreasingSystem2()); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private UserIndexer userIndexer = new UserIndexer(db.getDbClient(), es.client()); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private OrganizationCreation organizationCreation = mock(OrganizationCreation.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java index f04ac96cb9f..b42d3df7af1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java @@ -82,7 +82,7 @@ public class ListActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java index a6a17902375..46c701c140e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java @@ -78,7 +78,7 @@ public class ListActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java index 4487d1caadc..313f4462850 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java @@ -45,7 +45,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; public class ComponentIndexSearchTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java index b4b317b55fa..ddc5f3b1345 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java @@ -47,7 +47,7 @@ import static org.sonar.api.resources.Qualifiers.PROJECT; public abstract class ComponentIndexTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java index adfc85cc645..3caf9ff13a1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java @@ -52,7 +52,7 @@ public class ComponentIndexerTest { private System2 system2 = System2.INSTANCE; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index faae1ffb102..e1a01fa5585 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -85,7 +85,7 @@ public class SearchActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private I18nRule i18n = new I18nRule(); private TestDefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java index 4d73cf7681c..4f753a407ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java @@ -110,7 +110,7 @@ public class SearchProjectsActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java index b4c66136740..b3024b62fe1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java @@ -89,7 +89,7 @@ public class SuggestionsActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); public ResourceTypesRule resourceTypes = new ResourceTypesRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java index eca06309a38..47f29a6c2a2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java @@ -43,7 +43,7 @@ public class ScmAccountToUserLoaderTest { private static final String ORGANIZATION_UUID = "my-organization"; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java index bd7b839c823..4ab149e9224 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java @@ -43,7 +43,7 @@ public class BulkIndexerTest { private TestSystem2 testSystem2 = new TestSystem2().setNow(1_000L); @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition().setReplicas(1)); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition().setReplicas(1)); @Rule public DbTester dbTester = DbTester.create(testSystem2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java index 35877a165ac..3e658270f5e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java @@ -44,7 +44,7 @@ import static org.sonar.server.es.FakeIndexDefinition.INDEX_TYPE_FAKE; public class EsClientTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Test public void proxify_requests() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java index bb0be1280b8..ea98e881564 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java @@ -101,7 +101,7 @@ public class EsTester extends ExternalResource { /** * New instance which contains the core indices (rules, issues, ...). */ - public static EsTester core() { + public static EsTester create() { if (!CORE_INDICES_CREATED.get()) { Configuration config = new MapSettings().asConfig(); List createdIndices = createIndices( @@ -123,7 +123,7 @@ public class EsTester extends ExternalResource { * New instance which contains the specified indices. Note that * core indices may exist. */ - public static EsTester custom(IndexDefinition... definitions) { + public static EsTester createCustom(IndexDefinition... definitions) { createIndices(definitions); return new EsTester(true); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java index 8e4db8cb91c..a689dc6e344 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java @@ -48,7 +48,7 @@ public class IndexCreatorTest { public LogTester logTester = new LogTester(); @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); private MetadataIndexDefinition metadataIndexDefinition = new MetadataIndexDefinition(new MapSettings().asConfig()); private MetadataIndex metadataIndex = new MetadataIndex(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java index c4e5e0b1e17..fdb84c80a19 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java @@ -37,7 +37,7 @@ import static org.sonar.server.es.FakeIndexDefinition.INDEX_TYPE_FAKE; public class IndexerStartupTaskTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); private final MapSettings settings = new MapSettings(); private final MetadataIndex metadataIndex = mock(MetadataIndex.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java index 837d28a0d6c..1a4390882ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java @@ -39,7 +39,7 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.INDEX_TYPE_ISSUE public class OneToManyResilientIndexingListenerTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java index 80276c731e7..96098442246 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java @@ -39,7 +39,7 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.INDEX_TYPE_ISSUE public class OneToOneResilientIndexingListenerTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java index 434985e6f7e..bd6ec9ffcce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java @@ -63,7 +63,7 @@ public class RecoveryIndexerTest { private MapSettings emptySettings = new MapSettings(); @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public DbTester db = DbTester.create(system2); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/EsDbCompatibilityImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/EsDbCompatibilityImplTest.java index a925871b364..a610b6a63a8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/EsDbCompatibilityImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/EsDbCompatibilityImplTest.java @@ -38,7 +38,7 @@ public class EsDbCompatibilityImplTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.custom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition()); private DbClient dbClient = mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS); private MigrationHistory migrationHistory = mock(MigrationHistory.class); private MetadataIndex metadataIndex = new MetadataIndex(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java index fce57398521..845cf8eda38 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class MetadataIndexTest { @Rule - public EsTester es = EsTester.custom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition()); private final MetadataIndex underTest = new MetadataIndex(es.client()); private final String index = randomAlphanumeric(20); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java index fd275f86735..71e873eefb4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ProxyBulkRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java index 49a525a7c7c..9cefd20b945 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyClearCacheRequestBuilderTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java index 1925ff49ef0..634b0d59d6a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class ProxyCreateIndexRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java index 8f0fe77c871..93b53f25361 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyDeleteRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java index 9733723e213..27813585aae 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyFlushRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java index ef44c72b179..cc73bbc8400 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class ProxyGetRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java index c3116f77ff3..12a8e2dbb00 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.fail; public class ProxyIndexRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java index b593772772d..b65d7ff8179 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyIndicesExistsRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java index 6db4fad2b97..5e6e97d42b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyIndicesStatsRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java index 59b5722a823..6c213386b34 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; public class ProxyMultiGetRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java index cc61d738bee..4d11a810a7b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ProxyNodesStatsRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java index 23ff81ef24b..bbb639603d4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.fail; public class ProxyPutMappingRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java index 6a8c39a6954..8afc1b72d70 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class ProxyRefreshRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java index fb0e219dbbf..e0c587f58b7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class ProxySearchRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java index a8244603610..6a596aa535d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class ProxySearchScrollRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerHealthRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerHealthRequestBuilderTest.java index 96f3587efef..43c621523f9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerHealthRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerHealthRequestBuilderTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.fail; public class ProxyWebServerHealthRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStateRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStateRequestBuilderTest.java index 5e532f4da59..09efea45278 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStateRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStateRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyWebServerStateRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStatsRequestBuilderTest.java index 2bddb49e076..a274e792181 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStatsRequestBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStatsRequestBuilderTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.fail; public class ProxyWebServerStatsRequestBuilderTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java index 5b9966002d4..76f01cc824d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; public class EsStatusClusterCheckTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); private final Random random = new Random(); private EsStatusClusterCheck underTest = new EsStatusClusterCheck(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java index 1960e6e79e1..bd99f06633f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.when; public class EsStatusNodeCheckTest { @Rule - public EsTester es = EsTester.custom(); + public EsTester es = EsTester.createCustom(); private EsStatusNodeCheck underTest = new EsStatusNodeCheck(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java index e827ce8da53..c70bc29adff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java @@ -68,7 +68,7 @@ public class IssueUpdaterTest { public DbTester dbTester = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient dbClient = dbTester.getDbClient(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java index 504593f7cdd..80760e72e84 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java @@ -58,7 +58,7 @@ public class IssueIndexDebtTest { private System2 system2 = new TestSystem2().setNow(1_500_000_000_000L).setDefaultTimeZone(TimeZone.getTimeZone("GMT-01:00")); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java index a37dbbaaf34..b903da1ec39 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java @@ -50,7 +50,7 @@ public class IssueIndexProjectStatisticsTest { private System2 system2 = mock(System2.class); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java index 82584c7f691..06d0aa87466 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java @@ -85,7 +85,7 @@ import static org.sonar.server.issue.IssueDocTesting.newDoc; public class IssueIndexTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java index 6b36e2b3337..cb6e67f52f0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java @@ -60,7 +60,7 @@ import static org.sonar.server.permission.index.AuthorizationTypeSupport.TYPE_AU public class IssueIndexerTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java index 58b8bdb4c53..6f2a36b1a6c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java @@ -79,7 +79,7 @@ public class AddCommentActionTest { public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java index 05abdb4fe11..f1951110e3d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java @@ -74,7 +74,7 @@ public class AssignActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java index c7ca1c9d2f2..c26a64ce11a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java @@ -42,7 +42,7 @@ public class AuthorsActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java index 4864c527d2d..b8575618c25 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java @@ -99,7 +99,7 @@ public class BulkChangeActionTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java index 3bb29ad4a88..a6cced6e61d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java @@ -87,7 +87,7 @@ public class DoTransitionActionTest { public DbTester dbTester = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java index 5b531276d1e..62e2c28b31f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java @@ -89,7 +89,7 @@ public class SearchActionComponentsTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient dbClient = db.getDbClient(); private IssueIndex issueIndex = new IssueIndex(es.client(), System2.INSTANCE, userSession, new AuthorizationTypeSupport(userSession)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java index 4f1e005707a..ffbe2089fa6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java @@ -95,7 +95,7 @@ public class SearchActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java index 6f1bbc78bc7..7f7ac38fbc0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java @@ -77,7 +77,7 @@ public class SetSeverityActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java index cd5c8084f42..384f85e4d00 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java @@ -76,7 +76,7 @@ public class SetTagsActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java index 06ae3d16e9e..b3b11aeb5c4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java @@ -78,7 +78,7 @@ public class SetTypeActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java index 5b2f72706f3..8a4809ebda5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java @@ -57,7 +57,7 @@ public class TagsActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbTester.getDbClient(), new IssueIteratorFactory(dbTester.getDbClient())); private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), dbTester.getDbClient()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java index d248c4b70a3..962693cc967 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java @@ -73,7 +73,7 @@ public class CreateActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient dbClient = db.getDbClient(); private ComponentDto project; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java index 976d7f076bf..405a7aafed3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java @@ -53,7 +53,7 @@ public class MetricsActionTest { private static final String DEFAULT_PROJECT_KEY = "project-key"; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java index 0270d42cd15..d57eaf6b254 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java @@ -64,7 +64,7 @@ public class SearchActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private WsTester ws; private DbClient dbClient = db.getDbClient(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java index 3863327f45c..b065df28f12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java @@ -63,7 +63,7 @@ public class UpdateActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient dbClient = db.getDbClient(); private DbSession dbSession = db.getSession(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java index e3d09d304f1..e452edbcf09 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java @@ -96,7 +96,7 @@ public class ProjectMeasuresIndexTest { private static final GroupDto GROUP2 = newGroupDto(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java index bf3ca24f082..bebcdbc7fa8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java @@ -56,7 +56,7 @@ public class ProjectMeasuresIndexTextSearchTest { private static final OrganizationDto ORG = OrganizationTesting.newOrganizationDto(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java index f4e00e17851..08c6099864f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java @@ -55,7 +55,7 @@ public class ProjectMeasuresIndexerTest { private System2 system2 = System2.INSTANCE; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java index e98b3b5b0f7..b1a5a468289 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java @@ -89,7 +89,7 @@ public class OrganizationCreationImplTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java index 6ed80caa11b..9b49b150cea 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java @@ -65,7 +65,7 @@ public class AddMemberActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private UserIndex userIndex = new UserIndex(es.client(), System2.INSTANCE); @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java index b9467885086..457c5c82d41 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java @@ -84,7 +84,7 @@ public class CreateActionTest { @Rule public DbTester dbTester = DbTester.create(system2).setDisableDefaultOrganization(true); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java index 447c7018b99..78f7909f20d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java @@ -100,7 +100,7 @@ public class DeleteActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java index af549b17547..fdd91d53680 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java @@ -68,7 +68,7 @@ public class EnableSupportActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester); private OrganizationFlags organizationFlags = new OrganizationFlagsImpl(dbTester.getDbClient()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java index 7e3b8872d1e..31f2e7d04b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java @@ -72,7 +72,7 @@ public class RemoveMemberActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); private DbClient dbClient = db.getDbClient(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java index 6aeeeaae0bb..a4817351bf8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java @@ -60,7 +60,7 @@ public class SearchMembersActionTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java index 5514f7f9d13..34058ca988d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java @@ -53,7 +53,7 @@ public class PermissionIndexerTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.custom(new FooIndexDefinition()); + public EsTester es = EsTester.createCustom(new FooIndexDefinition()); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java index d130ad5b85e..2df0afdbeba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java @@ -53,7 +53,7 @@ public abstract class BasePermissionWsTest { public DbTester db = DbTester.create(new AlwaysIncreasingSystem2()); @Rule - public EsTester es = EsTester.custom(new FooIndexDefinition()); + public EsTester es = EsTester.createCustom(new FooIndexDefinition()); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java index bf7c6cf52c3..4d833f6a48b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class BackendCleanupTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java index bb037b2311d..d4873aa8e38 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java @@ -35,7 +35,7 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA public class EsIndexesSectionTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private EsIndexesSection underTest = new EsIndexesSection(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java index 5f11b795e1f..35bce1fb975 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java @@ -36,7 +36,7 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA public class EsStateSectionTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private EsStateSection underTest = new EsStateSection(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java index 1ec470680af..7c89c34a206 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java @@ -30,7 +30,7 @@ import static org.sonar.process.systeminfo.SystemInfoUtils.attribute; public class EsClusterStateSectionTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private EsClusterStateSection underTest = new EsClusterStateSection(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java index 51e7b08b308..6bc1dc9e9cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class SearchNodesInfoLoaderImplTest { @Rule - public EsTester es = EsTester.custom(new FakeIndexDefinition()); + public EsTester es = EsTester.createCustom(new FakeIndexDefinition()); private SearchNodesInfoLoaderImpl underTest = new SearchNodesInfoLoaderImpl(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java index 8e7d6244b86..4f6da21b9a0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java @@ -73,7 +73,7 @@ public class BulkUpdateKeyActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java index 7e02dd3151f..8ad0902bf8f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java @@ -85,7 +85,7 @@ public class UpdateVisibilityActionTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public EsTester es = EsTester.custom(new FooIndexDefinition()); + public EsTester es = EsTester.createCustom(new FooIndexDefinition()); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone().logIn(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java index 5631bc2ff57..b186377f564 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java @@ -52,7 +52,7 @@ public class SearchActionTest { private static final OrganizationDto ORG = OrganizationTesting.newOrganizationDto(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java index 5aa2d33a0f4..9e9536f6745 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java @@ -56,7 +56,7 @@ public class QProfileComparisonTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient db; private DbSession dbSession; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java index 6c35c6d720a..062d2dec6b8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java @@ -77,7 +77,7 @@ public class QProfileRuleImplTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); private RuleIndex ruleIndex = new RuleIndex(es.client(), system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java index 8ffd2bf6b73..13d38347f40 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java @@ -59,7 +59,7 @@ public class QProfileTreeImplTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); private ActiveRuleIndexer activeRuleIndexer = new ActiveRuleIndexer(db.getDbClient(), es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java index e5fa5e7c761..734a38e2535 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java @@ -53,7 +53,7 @@ public class ActiveRuleIndexerTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private ActiveRuleIndexer underTest = new ActiveRuleIndexer(db.getDbClient(), es.client()); private RuleDefinitionDto rule1; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java index 780effe6a94..707212e283a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java @@ -80,7 +80,7 @@ public class ChangeParentActionTest { @Rule public DbTester db = new DbTester(System2.INSTANCE, null); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java index 7a2496f1a57..a0b4aa3d96c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java @@ -82,7 +82,7 @@ public class CreateActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java index 81fe585c9f9..ad587ab496f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java @@ -72,7 +72,7 @@ public class InheritanceActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java index 14906f71ab5..e5c3db137cd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java @@ -77,7 +77,7 @@ public class QProfilesWsMediumTest { public UserSessionRule userSessionRule = UserSessionRule.standalone() .logIn().setRoot(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester dbTester = DbTester.create(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java index c4b5bf360db..5e3e09572dc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java @@ -61,7 +61,7 @@ public class ShowActionTest { private static Languages LANGUAGES = new Languages(XOO1, XOO2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index e56801d0d9a..429d8c8d561 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -103,7 +103,7 @@ public class RegisterRulesTest { @org.junit.Rule public DbTester dbTester = DbTester.create(system); @org.junit.Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @org.junit.Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java index 515a4eba16b..e09db08a604 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java @@ -64,7 +64,7 @@ public class RuleCreatorTest { public DbTester dbTester = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private RuleIndex ruleIndex = new RuleIndex(es.client(), system2); private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), dbTester.getDbClient()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java index e78dc45b318..da570b0b559 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java @@ -77,7 +77,7 @@ public class RuleUpdaterTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private RuleIndex ruleIndex = new RuleIndex(es.client(), system2); private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), db.getDbClient()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java index 2dca70212a4..651abace651 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java @@ -46,7 +46,7 @@ public class RuleIndexDefinitionTest { private RuleIndexDefinition underTest = new RuleIndexDefinition(settings.asConfig()); @Rule - public EsTester tester = EsTester.core(); + public EsTester tester = EsTester.create(); @Test public void test_definition_of_index() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java index 4610a09ff95..4c961c262dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java @@ -90,7 +90,7 @@ public class RuleIndexTest { private System2 system2 = new AlwaysIncreasingSystem2(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java index 92e0cbdf4c7..aede7681549 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java @@ -45,7 +45,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery; public class RuleIndexerTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester dbTester = DbTester.create(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java index 39152fd2133..f41511b2f9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java @@ -70,7 +70,7 @@ public class CreateActionTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java index 368815325e7..747274637ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java @@ -54,7 +54,7 @@ public class DeleteActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java index beec0a59ad0..450ee184427 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java @@ -101,7 +101,7 @@ public class SearchActionTest { @org.junit.Rule public DbTester db = DbTester.create(system2); @org.junit.Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private RuleIndex ruleIndex = new RuleIndex(es.client(), system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java index fb983219fee..be0ffb160b6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java @@ -89,7 +89,7 @@ public class ShowActionTest { @org.junit.Rule public DbTester dbTester = DbTester.create(); @org.junit.Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @org.junit.Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java index b6256560f05..7d2e695bcb1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java @@ -48,7 +48,7 @@ public class TagsActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private DbClient dbClient = db.getDbClient(); private EsClient esClient = es.client(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java index 48ee4743528..c66bc2e0b49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java @@ -81,7 +81,7 @@ public class UpdateActionTest { public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java b/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java index 9ab4d9167c2..0ed4e2289b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java @@ -84,7 +84,7 @@ public class TelemetryDaemonTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public LogTester logger = new LogTester().setLevel(LoggerLevel.DEBUG); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java index e5f915c1961..c1aaee145fd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexTest.java @@ -34,7 +34,7 @@ import static org.sonar.server.test.index.TestIndexDefinition.INDEX_TYPE_TEST; public class TestIndexTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private TestIndex underTest = new TestIndex(es.client(), System2.INSTANCE); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java index 1b39b9a9d9a..b03361d8674 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestIndexerTest.java @@ -49,7 +49,7 @@ public class TestIndexerTest { private System2 system2 = System2.INSTANCE; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java index 6a25a2e52ec..28b958b5a6d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java @@ -53,7 +53,7 @@ public class CoveredFilesActionTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java index 5e5d3eff1a6..8bdb50a4b18 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java @@ -67,7 +67,7 @@ public class ListActionTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java index 8d7452a5d22..350d8457ba4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java @@ -72,7 +72,7 @@ public class UserUpdaterCreateTest { public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java index 81bc9bc79a2..15b3d3c46a0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterUpdateTest.java @@ -64,7 +64,7 @@ public class UserUpdaterUpdateTest { public ExpectedException expectedException = ExpectedException.none(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public DbTester db = DbTester.create(system2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java index 42493ba1f38..8b4e6e90253 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexTest.java @@ -42,7 +42,7 @@ public class UserIndexTest { private static final String USER2_LOGIN = "user2"; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private UserIndex underTest = new UserIndex(es.client(), System2.INSTANCE); private UserQuery.Builder userQuery = UserQuery.builder(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java index dd4b86caa43..5b047b5d42b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/index/UserIndexerTest.java @@ -40,7 +40,7 @@ public class UserIndexerTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private UserIndexer underTest = new UserIndexer(db.getDbClient(), es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index 4765a5b2f5b..e865e2f368a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -51,7 +51,7 @@ public class ChangePasswordActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone().logIn(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index 4f0b41017e5..d995f5d2770 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -70,7 +70,7 @@ public class CreateActionTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java index e3115b266bb..298506d22ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java @@ -75,7 +75,7 @@ public class DeactivateActionTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java index cd076161c8e..1b30f2fe0d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java @@ -54,7 +54,7 @@ public class SearchActionTest { private System2 system2 = System2.INSTANCE; @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index d6fe89abd96..b41242f2b77 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -59,7 +59,7 @@ public class UpdateActionTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSession = UserSessionRule.standalone().logIn().setSystemAdministrator(); @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java index 87f435c7132..e86467e84ee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java @@ -32,7 +32,7 @@ import static org.sonar.server.view.index.ViewIndexDefinition.INDEX_TYPE_VIEW; public class ViewIndexTest { @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); private ViewIndex index = new ViewIndex(es.client()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java index 88af0fa7681..4b5b12b437d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java @@ -70,7 +70,7 @@ public class ViewIndexerTest { public DbTester dbTester = DbTester.create(system2); @Rule - public EsTester es = EsTester.core(); + public EsTester es = EsTester.create(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); -- 2.39.5