diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-04-11 12:24:31 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-04-12 20:20:48 +0200 |
| commit | 008f5eb3223a57baeca0e923abe424a7c8502229 (patch) | |
| tree | 4bd6fe9990f0eb3ae0d8f304c6832bc33c75361f /server | |
| parent | 72be5b2eca35f07c1a11d2be34fee2648655a67f (diff) | |
| download | sonarqube-008f5eb3223a57baeca0e923abe424a7c8502229.tar.gz sonarqube-008f5eb3223a57baeca0e923abe424a7c8502229.zip | |
Fix Quality flaws
Diffstat (limited to 'server')
39 files changed, 201 insertions, 255 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java deleted file mode 100644 index c7a77a3178b..00000000000 --- a/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2018 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.server.component.index; - -import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; -import org.junit.Rule; -import org.junit.Test; -import org.sonar.server.es.EsTester; - -public class NewTest { - - @Rule - public EsTester es = EsTester.core(); - - @Test - public void name() { - IndicesExistsResponse x = es.client().prepareIndicesExist("components").get(); - System.out.println(x.isExists()); - IndicesExistsResponse x2 = es.client().prepareIndicesExist("components").get(); - System.out.println(x2.isExists()); - } -} 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 15262da3bd3..552db86f990 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 @@ -200,7 +200,7 @@ public class EsTester extends ExternalResource { */ public <E extends BaseDoc> List<E> getDocuments(IndexType indexType, final Class<E> docClass) { List<SearchHit> hits = getDocuments(indexType); - return newArrayList(Collections2.transform(hits, input -> { + return new ArrayList<>(Collections2.transform(hits, input -> { try { return (E) ConstructorUtils.invokeConstructor(docClass, input.getSource()); } catch (Exception e) { @@ -235,11 +235,14 @@ public class EsTester extends ExternalResource { * Get a list of a specific field from all indexed documents. */ public <T> List<T> getDocumentFieldValues(IndexType indexType, final String fieldNameToReturn) { - return newArrayList(Iterables.transform(getDocuments(indexType), input -> (T) input.sourceAsMap().get(fieldNameToReturn))); + return getDocuments(indexType) + .stream() + .map(input -> (T) input.getSourceAsMap().get(fieldNameToReturn)) + .collect(Collectors.toList()); } public List<String> getIds(IndexType indexType) { - return getDocuments(indexType).stream().map(SearchHit::id).collect(Collectors.toList()); + return getDocuments(indexType).stream().map(SearchHit::getId).collect(Collectors.toList()); } public void lockWrites(IndexType index) { 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 c5240702527..49a525a7c7c 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,30 +33,30 @@ import static org.junit.Assert.fail; public class ProxyClearCacheRequestBuilderTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public LogTester logTester = new LogTester(); @Test public void clear_cache() { - ClearIndicesCacheRequestBuilder requestBuilder = esTester.client().prepareClearCache(); + ClearIndicesCacheRequestBuilder requestBuilder = es.client().prepareClearCache(); requestBuilder.get(); } @Test public void to_string() { - assertThat(esTester.client().prepareClearCache().toString()).isEqualTo("ES clear cache request"); - assertThat(esTester.client().prepareClearCache("rules").toString()).isEqualTo("ES clear cache request on indices 'rules'"); - assertThat(esTester.client().prepareClearCache().setFields("key").toString()).isEqualTo("ES clear cache request on fields 'key'"); - assertThat(esTester.client().prepareClearCache().setFieldDataCache(true).toString()).isEqualTo("ES clear cache request with field data cache"); - assertThat(esTester.client().prepareClearCache().setRequestCache(true).toString()).isEqualTo("ES clear cache request with request cache"); + assertThat(es.client().prepareClearCache().toString()).isEqualTo("ES clear cache request"); + assertThat(es.client().prepareClearCache("rules").toString()).isEqualTo("ES clear cache request on indices 'rules'"); + assertThat(es.client().prepareClearCache().setFields("key").toString()).isEqualTo("ES clear cache request on fields 'key'"); + assertThat(es.client().prepareClearCache().setFieldDataCache(true).toString()).isEqualTo("ES clear cache request with field data cache"); + assertThat(es.client().prepareClearCache().setRequestCache(true).toString()).isEqualTo("ES clear cache request with request cache"); } @Test public void trace_logs() { logTester.setLevel(LoggerLevel.TRACE); - ClearIndicesCacheRequestBuilder requestBuilder = esTester.client().prepareClearCache(); + ClearIndicesCacheRequestBuilder requestBuilder = es.client().prepareClearCache(); requestBuilder.get(); assertThat(logTester.logs()).hasSize(1); @@ -65,7 +65,7 @@ public class ProxyClearCacheRequestBuilderTest { @Test public void no_trace_logs() { logTester.setLevel(LoggerLevel.DEBUG); - ClearIndicesCacheRequestBuilder requestBuilder = esTester.client().prepareClearCache(); + ClearIndicesCacheRequestBuilder requestBuilder = es.client().prepareClearCache(); requestBuilder.get(); assertThat(logTester.logs()).isEmpty(); @@ -74,7 +74,7 @@ public class ProxyClearCacheRequestBuilderTest { @Test public void get_with_string_timeout_is_not_yet_implemented() { try { - esTester.client().prepareClearCache().get("1"); + es.client().prepareClearCache().get("1"); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -84,7 +84,7 @@ public class ProxyClearCacheRequestBuilderTest { @Test public void get_with_time_value_timeout_is_not_yet_implemented() { try { - esTester.client().prepareClearCache().get(TimeValue.timeValueMinutes(1)); + es.client().prepareClearCache().get(TimeValue.timeValueMinutes(1)); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -94,7 +94,7 @@ public class ProxyClearCacheRequestBuilderTest { @Test public void execute_should_throw_an_unsupported_operation_exception() { try { - esTester.client().prepareClearCache().execute(); + es.client().prepareClearCache().execute(); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(UnsupportedOperationException.class).hasMessage("execute() should not be called as it's used for asynchronous"); 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 a2fb6689b44..96f3587efef 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,29 +35,29 @@ import static org.junit.Assert.fail; public class ProxyWebServerHealthRequestBuilderTest { @Rule - public EsTester esTester = EsTester.custom(); + public EsTester es = EsTester.custom(); @Rule public LogTester logTester = new LogTester(); @Test public void state() { - ClusterHealthRequestBuilder requestBuilder = esTester.client().prepareHealth(); + ClusterHealthRequestBuilder requestBuilder = es.client().prepareHealth(); ClusterHealthResponse state = requestBuilder.get(); assertThat(state.getStatus()).isEqualTo(ClusterHealthStatus.GREEN); } @Test public void to_string() { - assertThat(esTester.client().prepareHealth("rules").toString()).isEqualTo("ES cluster health request on indices 'rules'"); - assertThat(esTester.client().prepareHealth().toString()).isEqualTo("ES cluster health request"); + assertThat(es.client().prepareHealth("rules").toString()).isEqualTo("ES cluster health request on indices 'rules'"); + assertThat(es.client().prepareHealth().toString()).isEqualTo("ES cluster health request"); } @Test public void trace_logs() { logTester.setLevel(LoggerLevel.TRACE); - ClusterHealthRequestBuilder requestBuilder = esTester.client().prepareHealth(); + ClusterHealthRequestBuilder requestBuilder = es.client().prepareHealth(); ClusterHealthResponse state = requestBuilder.get(); assertThat(state.getStatus()).isEqualTo(ClusterHealthStatus.GREEN); @@ -67,7 +67,7 @@ public class ProxyWebServerHealthRequestBuilderTest { @Test public void get_with_string_timeout_is_not_yet_implemented() { try { - esTester.client().prepareHealth().get("1"); + es.client().prepareHealth().get("1"); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -77,7 +77,7 @@ public class ProxyWebServerHealthRequestBuilderTest { @Test public void get_with_time_value_timeout_is_not_yet_implemented() { try { - esTester.client().prepareHealth().get(TimeValue.timeValueMinutes(1)); + es.client().prepareHealth().get(TimeValue.timeValueMinutes(1)); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -87,7 +87,7 @@ public class ProxyWebServerHealthRequestBuilderTest { @Test public void execute_should_throw_an_unsupported_operation_exception() { try { - esTester.client().prepareHealth().execute(); + es.client().prepareHealth().execute(); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(UnsupportedOperationException.class).hasMessage("execute() should not be called as it's used for asynchronous"); 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 9a6cd423df5..5e532f4da59 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,28 +33,28 @@ import static org.junit.Assert.fail; public class ProxyWebServerStateRequestBuilderTest { @Rule - public EsTester esTester = EsTester.custom(); + public EsTester es = EsTester.custom(); @Rule public LogTester logTester = new LogTester(); @Test public void state() { - ClusterStateRequestBuilder requestBuilder = esTester.client().prepareState(); + ClusterStateRequestBuilder requestBuilder = es.client().prepareState(); requestBuilder.get(); } @Test public void to_string() { - assertThat(esTester.client().prepareState().setIndices("rules").toString()).isEqualTo("ES cluster state request on indices 'rules'"); - assertThat(esTester.client().prepareState().toString()).isEqualTo("ES cluster state request"); + assertThat(es.client().prepareState().setIndices("rules").toString()).isEqualTo("ES cluster state request on indices 'rules'"); + assertThat(es.client().prepareState().toString()).isEqualTo("ES cluster state request"); } @Test public void trace_logs() { logTester.setLevel(LoggerLevel.TRACE); - ClusterStateRequestBuilder requestBuilder = esTester.client().prepareState(); + ClusterStateRequestBuilder requestBuilder = es.client().prepareState(); requestBuilder.get(); assertThat(logTester.logs()).hasSize(1); @@ -63,7 +63,7 @@ public class ProxyWebServerStateRequestBuilderTest { @Test public void get_with_string_timeout_is_not_yet_implemented() { try { - esTester.client().prepareState().get("1"); + es.client().prepareState().get("1"); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -73,7 +73,7 @@ public class ProxyWebServerStateRequestBuilderTest { @Test public void get_with_time_value_timeout_is_not_yet_implemented() { try { - esTester.client().prepareState().get(TimeValue.timeValueMinutes(1)); + es.client().prepareState().get(TimeValue.timeValueMinutes(1)); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -83,7 +83,7 @@ public class ProxyWebServerStateRequestBuilderTest { @Test public void execute_should_throw_an_unsupported_operation_exception() { try { - esTester.client().prepareState().execute(); + es.client().prepareState().execute(); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(UnsupportedOperationException.class).hasMessage("execute() should not be called as it's used for asynchronous"); 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 12ef480bad0..2bddb49e076 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,28 +33,28 @@ import static org.junit.Assert.fail; public class ProxyWebServerStatsRequestBuilderTest { @Rule - public EsTester esTester = EsTester.custom(); + public EsTester es = EsTester.custom(); @Rule public LogTester logTester = new LogTester(); @Test public void stats() { - ClusterStatsRequestBuilder requestBuilder = esTester.client().prepareClusterStats(); + ClusterStatsRequestBuilder requestBuilder = es.client().prepareClusterStats(); requestBuilder.get(); } @Test public void to_string() { - assertThat(esTester.client().prepareClusterStats().setNodesIds("node1").toString()).isEqualTo("ES cluster stats request on nodes 'node1'"); - assertThat(esTester.client().prepareClusterStats().toString()).isEqualTo("ES cluster stats request"); + assertThat(es.client().prepareClusterStats().setNodesIds("node1").toString()).isEqualTo("ES cluster stats request on nodes 'node1'"); + assertThat(es.client().prepareClusterStats().toString()).isEqualTo("ES cluster stats request"); } @Test public void trace_logs() { logTester.setLevel(LoggerLevel.TRACE); - ClusterStatsRequestBuilder requestBuilder = esTester.client().prepareClusterStats(); + ClusterStatsRequestBuilder requestBuilder = es.client().prepareClusterStats(); requestBuilder.get(); assertThat(logTester.logs()).hasSize(1); } @@ -62,7 +62,7 @@ public class ProxyWebServerStatsRequestBuilderTest { @Test public void get_with_string_timeout_is_not_yet_implemented() { try { - esTester.client().prepareClusterStats().get("1"); + es.client().prepareClusterStats().get("1"); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -72,7 +72,7 @@ public class ProxyWebServerStatsRequestBuilderTest { @Test public void get_with_time_value_timeout_is_not_yet_implemented() { try { - esTester.client().prepareClusterStats().get(TimeValue.timeValueMinutes(1)); + es.client().prepareClusterStats().get(TimeValue.timeValueMinutes(1)); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalStateException.class).hasMessage("Not yet implemented"); @@ -82,7 +82,7 @@ public class ProxyWebServerStatsRequestBuilderTest { @Test public void execute_should_throw_an_unsupported_operation_exception() { try { - esTester.client().prepareClusterStats().execute(); + es.client().prepareClusterStats().execute(); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(UnsupportedOperationException.class).hasMessage("execute() should not be called as it's used for asynchronous"); 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 e8e5e75a153..5b9966002d4 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,10 +38,10 @@ import static org.mockito.Mockito.when; public class EsStatusClusterCheckTest { @Rule - public EsTester esTester = EsTester.custom(); + public EsTester es = EsTester.custom(); private final Random random = new Random(); - private EsStatusClusterCheck underTest = new EsStatusClusterCheck(esTester.client()); + private EsStatusClusterCheck underTest = new EsStatusClusterCheck(es.client()); @Test public void check_ignores_NodeHealth_arg_and_returns_RED_with_cause_if_an_exception_occurs_checking_ES_cluster_status() { 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 e631fea3bb1..1960e6e79e1 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,9 +31,9 @@ import static org.mockito.Mockito.when; public class EsStatusNodeCheckTest { @Rule - public EsTester esTester = EsTester.custom(); + public EsTester es = EsTester.custom(); - private EsStatusNodeCheck underTest = new EsStatusNodeCheck(esTester.client()); + private EsStatusNodeCheck underTest = new EsStatusNodeCheck(es.client()); @Test public void check_ignores_NodeHealth_arg_and_returns_RED_with_cause_if_an_exception_occurs_checking_ES_cluster_status() { 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 1614ccc4a01..e827ce8da53 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); private DbClient dbClient = dbTester.getDbClient(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester); @@ -80,7 +80,7 @@ public class IssueUpdaterTest { private NotificationManager notificationManager = mock(NotificationManager.class); private ArgumentCaptor<IssueChangeNotification> notificationArgumentCaptor = ArgumentCaptor.forClass(IssueChangeNotification.class); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); private IssueUpdater underTest = new IssueUpdater(dbClient, new ServerIssueStorage(system2, new DefaultRuleFinder(dbClient, defaultOrganizationProvider), dbClient, issueIndexer), notificationManager, issueChangePostProcessor); 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 932ead98e63..a37dbbaaf34 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 @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.config.internal.MapSettings; import org.sonar.api.issue.Issue; import org.sonar.api.utils.System2; import org.sonar.db.component.ComponentDto; @@ -50,7 +49,6 @@ import static org.sonar.server.issue.IssueDocTesting.newDoc; public class IssueIndexProjectStatisticsTest { private System2 system2 = mock(System2.class); - private MapSettings settings = new MapSettings(); @Rule public EsTester es = EsTester.core(); @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 14018d6bb4b..58b8bdb4c53 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -91,7 +91,7 @@ public class AddCommentActionTest { private IssueDbTester issueDbTester = new IssueDbTester(dbTester); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private ServerIssueStorage serverIssueStorage = new ServerIssueStorage(system2, new DefaultRuleFinder(dbClient, defaultOrganizationProvider), dbClient, issueIndexer); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); private IssueUpdater issueUpdater = new IssueUpdater(dbClient, serverIssueStorage, mock(NotificationManager.class), issueChangePostProcessor); 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 e73c30ace75..3bb29ad4a88 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -103,7 +103,7 @@ public class DoTransitionActionTest { private IssueWorkflow workflow = new IssueWorkflow(new FunctionExecutor(updater), updater); private TransitionService transitionService = new TransitionService(userSession, workflow); private OperationResponseWriter responseWriter = mock(OperationResponseWriter.class); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); private IssueUpdater issueUpdater = new IssueUpdater(dbClient, new ServerIssueStorage(system2, new DefaultRuleFinder(dbClient, defaultOrganizationProvider), dbClient, issueIndexer), mock(NotificationManager.class), 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 fb724043a00..6f1bbc78bc7 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -89,7 +89,7 @@ public class SetSeverityActionTest { private OperationResponseWriter responseWriter = mock(OperationResponseWriter.class); private ArgumentCaptor<SearchResponseData> preloadedSearchResponseDataCaptor = ArgumentCaptor.forClass(SearchResponseData.class); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); private WsActionTester tester = new WsActionTester(new SetSeverityAction(userSession, dbClient, new IssueFinder(dbClient, userSession), new IssueFieldsSetter(), new IssueUpdater(dbClient, 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 d3f9c6e0bb8..cd5c8084f42 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -84,7 +84,7 @@ public class SetTagsActionTest { private DbClient dbClient = db.getDbClient(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private OperationResponseWriter responseWriter = mock(OperationResponseWriter.class); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private ArgumentCaptor<SearchResponseData> preloadedSearchResponseDataCaptor = ArgumentCaptor.forClass(SearchResponseData.class); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); 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 f288231be21..06ae3d16e9e 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -91,7 +91,7 @@ public class SetTypeActionTest { private OperationResponseWriter responseWriter = mock(OperationResponseWriter.class); private ArgumentCaptor<SearchResponseData> preloadedSearchResponseDataCaptor = ArgumentCaptor.forClass(SearchResponseData.class); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); private TestIssueChangePostProcessor issueChangePostProcessor = new TestIssueChangePostProcessor(); private WsActionTester tester = new WsActionTester(new SetTypeAction(userSession, dbClient, new IssueFinder(dbClient, userSession), new IssueFieldsSetter(), new IssueUpdater(dbClient, 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 011651cf23a..5b2f72706f3 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 @@ -23,7 +23,6 @@ import java.util.Collections; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.config.internal.MapSettings; import org.sonar.api.server.ws.WebService.Action; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.System2; @@ -53,7 +52,6 @@ import static org.sonar.test.JsonAssert.assertJson; public class TagsActionTest { - private MapSettings settings = new MapSettings(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule 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 55fa8d70a65..d248c4b70a3 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 @@ -75,12 +75,10 @@ public class CreateActionTest { @Rule public EsTester es = EsTester.core(); - DbClient dbClient = db.getDbClient(); - ComponentDto project; - - final DbSession dbSession = db.getSession(); - - WsTester ws; + private DbClient dbClient = db.getDbClient(); + private ComponentDto project; + private final DbSession dbSession = db.getSession(); + private WsTester ws; @Before public void setUp() { 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 2741edb75e1..976d7f076bf 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 @@ -61,11 +61,10 @@ public class MetricsActionTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); - final DbClient dbClient = db.getDbClient(); - final DbSession dbSession = db.getSession(); - - WsTester ws; - ComponentDto defaultProject; + private final DbClient dbClient = db.getDbClient(); + private final DbSession dbSession = db.getSession(); + private WsTester ws; + private ComponentDto defaultProject; @Before public void setUp() throws Exception { 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 187e506c567..0270d42cd15 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 @@ -66,10 +66,10 @@ public class SearchActionTest { @Rule public EsTester es = EsTester.core(); - WsTester ws; - DbClient dbClient = db.getDbClient(); - DbSession dbSession = db.getSession(); - ComponentDto defaultProject; + private WsTester ws; + private DbClient dbClient = db.getDbClient(); + private DbSession dbSession = db.getSession(); + private ComponentDto defaultProject; @Before public void setUp() { 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 082cea4a7c4..d130ad5b85e 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<A extends PermissionsWsAction> { public DbTester db = DbTester.create(new AlwaysIncreasingSystem2()); @Rule - public EsTester esTester = EsTester.custom(new FooIndexDefinition()); + public EsTester es = EsTester.custom(new FooIndexDefinition()); @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -84,7 +84,7 @@ public abstract class BasePermissionWsTest<A extends PermissionsWsAction> { protected PermissionUpdater newPermissionUpdater() { return new PermissionUpdater( - new ProjectIndexersImpl(new PermissionIndexer(db.getDbClient(), esTester.client())), + new ProjectIndexersImpl(new PermissionIndexer(db.getDbClient(), es.client())), new UserPermissionChanger(db.getDbClient()), new GroupPermissionChanger(db.getDbClient())); } 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 a5a4524139d..bf7c6cf52c3 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,12 +48,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class BackendCleanupTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - private BackendCleanup underTest = new BackendCleanup(esTester.client(), dbTester.getDbClient()); + private BackendCleanup underTest = new BackendCleanup(es.client(), dbTester.getDbClient()); private OrganizationDto organization; @Before @@ -75,28 +75,28 @@ public class BackendCleanupTest { @Test public void clear_indexes() { - esTester.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); - esTester.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); - esTester.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); + es.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); + es.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); + es.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); underTest.clearIndexes(); - assertThat(esTester.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isEqualTo(0); - assertThat(esTester.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isEqualTo(0); + assertThat(es.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isEqualTo(0); + assertThat(es.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isEqualTo(0); } @Test public void clear_all() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - esTester.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); - esTester.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); - esTester.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); + es.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); + es.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); + es.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); underTest.clearAll(); - assertThat(esTester.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isEqualTo(0); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(0); - assertThat(esTester.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isEqualTo(0); + assertThat(es.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isEqualTo(0); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(0); + assertThat(es.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isEqualTo(0); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(0); assertThat(dbTester.countRowsOfTable("snapshots")).isEqualTo(0); @@ -107,28 +107,28 @@ public class BackendCleanupTest { @Test public void reset_data() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - esTester.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); - esTester.putDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, new ViewDoc().setUuid("CDEF").setProjects(newArrayList("DEFG"))); - esTester.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); - esTester.putDocuments(ProjectMeasuresIndexDefinition.INDEX_TYPE_PROJECT_MEASURES, new ProjectMeasuresDoc() + es.putDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE, IssueDocTesting.newDoc()); + es.putDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, new ViewDoc().setUuid("CDEF").setProjects(newArrayList("DEFG"))); + es.putDocuments(RuleIndexDefinition.INDEX_TYPE_RULE, newRuleDoc()); + es.putDocuments(ProjectMeasuresIndexDefinition.INDEX_TYPE_PROJECT_MEASURES, new ProjectMeasuresDoc() .setId("PROJECT") .setKey("Key") .setName("Name")); - esTester.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); + es.putDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT, newComponentDoc()); underTest.resetData(); assertThat(dbTester.countRowsOfTable("projects")).isZero(); assertThat(dbTester.countRowsOfTable("snapshots")).isZero(); assertThat(dbTester.countRowsOfTable("properties")).isZero(); - assertThat(esTester.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isZero(); - assertThat(esTester.countDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW)).isZero(); - assertThat(esTester.countDocuments(ProjectMeasuresIndexDefinition.INDEX_TYPE_PROJECT_MEASURES)).isZero(); - assertThat(esTester.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isZero(); + assertThat(es.countDocuments(IssueIndexDefinition.INDEX_TYPE_ISSUE)).isZero(); + assertThat(es.countDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW)).isZero(); + assertThat(es.countDocuments(ProjectMeasuresIndexDefinition.INDEX_TYPE_PROJECT_MEASURES)).isZero(); + assertThat(es.countDocuments(ComponentIndexDefinition.INDEX_TYPE_COMPONENT)).isZero(); // Rules should not be removed assertThat(dbTester.countRowsOfTable("rules")).isEqualTo(1); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); } private static RuleDoc newRuleDoc() { 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 ae1a8a04d1b..bb037b2311d 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,9 +35,9 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA public class EsIndexesSectionTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); - private EsIndexesSection underTest = new EsIndexesSection(esTester.client()); + private EsIndexesSection underTest = new EsIndexesSection(es.client()); @Test public void name() { 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 166b0793e25..5f11b795e1f 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,9 +36,9 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA public class EsStateSectionTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); - private EsStateSection underTest = new EsStateSection(esTester.client()); + private EsStateSection underTest = new EsStateSection(es.client()); @Test public void name() { 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 c273f8b0659..1ec470680af 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,9 +30,9 @@ import static org.sonar.process.systeminfo.SystemInfoUtils.attribute; public class EsClusterStateSectionTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); - private EsClusterStateSection underTest = new EsClusterStateSection(esTester.client()); + private EsClusterStateSection underTest = new EsClusterStateSection(es.client()); @Test public void test_name() { 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 a146b13c0b6..7e02dd3151f 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,10 +85,9 @@ public class UpdateVisibilityActionTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public EsTester esTester = EsTester.custom(new FooIndexDefinition()); + public EsTester es = EsTester.custom(new FooIndexDefinition()); @Rule - public UserSessionRule userSessionRule = UserSessionRule.standalone() - .logIn(); + public UserSessionRule userSessionRule = UserSessionRule.standalone().logIn(); @Rule public ExpectedException expectedException = ExpectedException.none(); 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 fa2a1becbb8..780effe6a94 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @Rule @@ -101,7 +101,7 @@ public class ChangeParentActionTest { public void setUp() { dbClient = db.getDbClient(); dbSession = db.getSession(); - EsClient esClient = esTester.client(); + EsClient esClient = es.client(); ruleIndex = new RuleIndex(esClient, System2.INSTANCE); ruleIndexer = new RuleIndexer(esClient, dbClient); activeRuleIndexer = new ActiveRuleIndexer(dbClient, esClient); 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 e0024353ccc..14906f71ab5 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,15 +77,15 @@ public class QProfilesWsMediumTest { public UserSessionRule userSessionRule = UserSessionRule.standalone() .logIn().setRoot(); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public DbTester dbTester = DbTester.create(); private DbClient dbClient = dbTester.getDbClient(); private DbSession dbSession = dbTester.getSession(); - private RuleIndex ruleIndex = new RuleIndex(esTester.client(), System2.INSTANCE); - private RuleIndexer ruleIndexer = new RuleIndexer(esTester.client(), dbClient); - private ActiveRuleIndexer activeRuleIndexer = new ActiveRuleIndexer(dbClient, esTester.client()); + private RuleIndex ruleIndex = new RuleIndex(es.client(), System2.INSTANCE); + private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), dbClient); + private ActiveRuleIndexer activeRuleIndexer = new ActiveRuleIndexer(dbClient, es.client()); private TypeValidations typeValidations = new TypeValidations(emptyList()); private RuleActivator ruleActivator = new RuleActivator(System2.INSTANCE, dbClient, typeValidations, userSessionRule); private QProfileRules qProfileRules = new QProfileRulesImpl(dbClient, ruleActivator, ruleIndex, activeRuleIndexer); 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 1842e691133..e56801d0d9a 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @org.junit.Rule public LogTester logTester = new LogTester(); @@ -120,9 +120,9 @@ public class RegisterRulesTest { @Before public void before() { when(system.now()).thenReturn(DATE1.getTime()); - ruleIndexer = new RuleIndexer(esTester.client(), dbClient); - ruleIndex = new RuleIndex(esTester.client(), system); - activeRuleIndexer = new ActiveRuleIndexer(dbClient, esTester.client()); + ruleIndexer = new RuleIndexer(es.client(), dbClient); + ruleIndex = new RuleIndex(es.client(), system); + activeRuleIndexer = new ActiveRuleIndexer(dbClient, es.client()); defaultOrganization = dbTester.getDefaultOrganization(); } @@ -227,7 +227,7 @@ public class RegisterRulesTest { .containsOnly(RuleStatus.READY); // verify index - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(numberOfRules); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(numberOfRules); assertThat(ruleIndex.search(new RuleQuery(), new SearchOptions()).getIds()) .isNotEmpty(); @@ -241,7 +241,7 @@ public class RegisterRulesTest { .containsOnly(RuleStatus.REMOVED); // verify index (documents are still in the index, but all are removed) - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(numberOfRules); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(numberOfRules); assertThat(ruleIndex.search(new RuleQuery(), new SearchOptions()).getIds()) .isEmpty(); } @@ -264,7 +264,7 @@ public class RegisterRulesTest { assertThat(dbClient.ruleDao().selectAllDefinitions(dbTester.getSession())).hasSize(2); RuleDto rule1 = dbClient.ruleDao().selectOrFailByKey(dbTester.getSession(), defaultOrganization, RULE_KEY1); RuleDto rule2 = dbClient.ruleDao().selectOrFailByKey(dbTester.getSession(), defaultOrganization, RULE_KEY2); - assertThat(esTester.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).containsOnly(valueOf(rule1.getId()), valueOf(rule2.getId())); + assertThat(es.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).containsOnly(valueOf(rule1.getId()), valueOf(rule2.getId())); // user adds tags and sets markdown note rule1.setTags(newHashSet("usertag1", "usertag2")); @@ -615,7 +615,7 @@ public class RegisterRulesTest { RuleDto rule1 = dbClient.ruleDao().selectOrFailByKey(dbTester.getSession(), defaultOrganization, RULE_KEY1); RuleDto rule2 = dbClient.ruleDao().selectOrFailByKey(dbTester.getSession(), defaultOrganization, RULE_KEY2); - assertThat(esTester.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).containsOnly(valueOf(rule1.getId()), valueOf(rule2.getId())); + assertThat(es.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).containsOnly(valueOf(rule1.getId()), valueOf(rule2.getId())); assertThat(rule2.getStatus()).isEqualTo(RuleStatus.READY); @@ -650,7 +650,7 @@ public class RegisterRulesTest { execute(new BigRepository()); assertThat(dbTester.countRowsOfTable("rules")).isEqualTo(BigRepository.SIZE); assertThat(dbTester.countRowsOfTable("rules_parameters")).isEqualTo(BigRepository.SIZE * 20); - assertThat(esTester.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).hasSize(BigRepository.SIZE); + assertThat(es.getIds(RuleIndexDefinition.INDEX_TYPE_RULE)).hasSize(BigRepository.SIZE); } @Test 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 e05272d092c..92e0cbdf4c7 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,13 +45,13 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery; public class RuleIndexerTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public DbTester dbTester = DbTester.create(); private DbClient dbClient = dbTester.getDbClient(); - private final RuleIndexer underTest = new RuleIndexer(esTester.client(), dbClient); + private final RuleIndexer underTest = new RuleIndexer(es.client(), dbClient); private DbSession dbSession = dbTester.getSession(); private RuleDefinitionDto rule = new RuleDefinitionDto() .setRuleKey("S001") @@ -73,7 +73,7 @@ public class RuleIndexerTest { @Test public void index_nothing() { underTest.index(dbSession, Collections.emptyList()); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(0L); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(0L); } @Test @@ -81,7 +81,7 @@ public class RuleIndexerTest { dbClient.ruleDao().insert(dbSession, rule); underTest.commitAndIndex(dbSession, rule.getId()); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); } @Test @@ -90,13 +90,13 @@ public class RuleIndexerTest { dbClient.ruleDao().insert(dbSession, rule.setStatus(RuleStatus.READY)); dbSession.commit(); underTest.commitAndIndex(dbTester.getSession(), rule.getId()); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); // Remove rule dbTester.getDbClient().ruleDao().update(dbTester.getSession(), rule.setStatus(RuleStatus.READY).setUpdatedAt(2000000000000L)); underTest.commitAndIndex(dbTester.getSession(), rule.getId()); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); } @Test @@ -111,7 +111,7 @@ public class RuleIndexerTest { .setRuleId(rule.getId()) .setScope(RuleExtensionScope.organization(organization.getUuid())); assertThat( - esTester.client() + es.client() .prepareSearch(RuleIndexDefinition.INDEX_TYPE_RULE_EXTENSION) .setQuery(termQuery("_id", doc.getId())) .get() @@ -126,6 +126,6 @@ public class RuleIndexerTest { RuleDefinitionDto rule = dbTester.rules().insert(r -> r.setDescription(description)); underTest.commitAndIndex(dbTester.getSession(), rule.getId()); - assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); + assertThat(es.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1); } } 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 58b5995a2c3..368815325e7 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,13 +54,13 @@ public class DeleteActionTest { @Rule public DbTester dbTester = DbTester.create(); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public ExpectedException thrown = ExpectedException.none(); private DbClient dbClient = dbTester.getDbClient(); private DbSession dbSession = dbTester.getSession(); - private RuleIndexer ruleIndexer = spy(new RuleIndexer(esTester.client(), dbClient)); + private RuleIndexer ruleIndexer = spy(new RuleIndexer(es.client(), dbClient)); private QProfileRules qProfileRules = mock(QProfileRules.class); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.fromUuid("ORG1"); private RuleWsSupport ruleWsSupport = new RuleWsSupport(mock(DbClient.class), userSession, defaultOrganizationProvider); 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 e9f3951cc21..fb983219fee 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 @@ -84,17 +84,17 @@ import static org.sonarqube.ws.MediaTypes.PROTOBUF; public class ShowActionTest { - public static final String INTERPRETED = "interpreted"; + private static final String INTERPRETED = "interpreted"; @org.junit.Rule public DbTester dbTester = DbTester.create(); @org.junit.Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @org.junit.Rule public ExpectedException thrown = ExpectedException.none(); private DbClient dbClient = dbTester.getDbClient(); - private EsClient esClient = esTester.client(); + private EsClient esClient = es.client(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester); private MacroInterpreter macroInterpreter = mock(MacroInterpreter.class); 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 4a2605f4fd6..48ee4743528 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,20 +81,19 @@ public class UpdateActionTest { public DbTester db = DbTester.create(); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); private DbClient dbClient = db.getDbClient(); - private EsClient esClient = esTester.client(); + private EsClient esClient = es.client(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private Languages languages = new Languages(); private RuleMapper mapper = new RuleMapper(languages, createMacroInterpreter()); private RuleIndexer ruleIndexer = new RuleIndexer(esClient, dbClient); private RuleUpdater ruleUpdater = new RuleUpdater(dbClient, ruleIndexer, System2.INSTANCE); - private RuleWsSupport ruleWsSupport = new RuleWsSupport(dbClient, userSession, defaultOrganizationProvider); private WsAction underTest = new UpdateAction(dbClient, ruleUpdater, mapper, userSession, defaultOrganizationProvider); private WsActionTester ws = new WsActionTester(underTest); 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 1b73cad0dc8..42493ba1f38 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 @@ -22,7 +22,6 @@ package org.sonar.server.user.index; import java.util.Collections; import java.util.List; import java.util.Locale; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; @@ -41,26 +40,18 @@ public class UserIndexTest { private static final String ORGANIZATION_UUID = "my-organization"; private static final String USER1_LOGIN = "user1"; private static final String USER2_LOGIN = "user2"; - private static final long DATE_1 = 1_500_000_000_000L; - private static final long DATE_2 = 1_500_000_000_001L; @Rule - public EsTester esTester = EsTester.core(); - - private UserIndex underTest; + public EsTester es = EsTester.core(); + private UserIndex underTest = new UserIndex(es.client(), System2.INSTANCE); private UserQuery.Builder userQuery = UserQuery.builder(); - @Before - public void setUp() { - underTest = new UserIndex(esTester.client(), System2.INSTANCE); - } - @Test public void get_nullable_by_login() { UserDoc user1 = newUser(USER1_LOGIN, asList("scmA", "scmB")); - esTester.putDocuments(INDEX_TYPE_USER, user1); - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, Collections.emptyList())); + es.putDocuments(INDEX_TYPE_USER, user1); + es.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, Collections.emptyList())); UserDoc userDoc = underTest.getNullableByLogin(USER1_LOGIN); assertThat(userDoc).isNotNull(); @@ -77,7 +68,7 @@ public class UserIndexTest { @Test public void getNullableByLogin_is_case_sensitive() { UserDoc user1 = newUser(USER1_LOGIN, asList("scmA", "scmB")); - esTester.putDocuments(INDEX_TYPE_USER, user1); + es.putDocuments(INDEX_TYPE_USER, user1); assertThat(underTest.getNullableByLogin(USER1_LOGIN)).isNotNull(); assertThat(underTest.getNullableByLogin("UsEr1")).isNull(); @@ -88,9 +79,9 @@ public class UserIndexTest { UserDoc user1 = newUser("user1", asList("user_1", "u1")); UserDoc user2 = newUser("user_with_same_email_as_user1", asList("user_2")).setEmail(user1.email()); UserDoc user3 = newUser("inactive_user_with_same_scm_as_user1", user1.scmAccounts()).setActive(false); - esTester.putDocuments(INDEX_TYPE_USER, user1); - esTester.putDocuments(INDEX_TYPE_USER, user2); - esTester.putDocuments(INDEX_TYPE_USER, user3); + es.putDocuments(INDEX_TYPE_USER, user1); + es.putDocuments(INDEX_TYPE_USER, user2); + es.putDocuments(INDEX_TYPE_USER, user3); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount(user1.scmAccounts().get(0), ORGANIZATION_UUID)).extractingResultOf("login").containsOnly(user1.login()); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount(user1.login(), ORGANIZATION_UUID)).extractingResultOf("login").containsOnly(user1.login()); @@ -106,7 +97,7 @@ public class UserIndexTest { public void getAtMostThreeActiveUsersForScmAccount_ignores_inactive_user() { String scmAccount = "scmA"; UserDoc user = newUser(USER1_LOGIN, singletonList(scmAccount)).setActive(false); - esTester.putDocuments(INDEX_TYPE_USER, user); + es.putDocuments(INDEX_TYPE_USER, user); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount(user.login(), ORGANIZATION_UUID)).isEmpty(); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount(scmAccount, ORGANIZATION_UUID)).isEmpty(); @@ -119,10 +110,10 @@ public class UserIndexTest { UserDoc user2 = newUser("user2", Collections.emptyList()).setEmail(email); UserDoc user3 = newUser("user3", Collections.emptyList()).setEmail(email); UserDoc user4 = newUser("user4", Collections.emptyList()).setEmail(email); - esTester.putDocuments(INDEX_TYPE_USER, user1); - esTester.putDocuments(INDEX_TYPE_USER, user2); - esTester.putDocuments(INDEX_TYPE_USER, user3); - esTester.putDocuments(INDEX_TYPE_USER, user4); + es.putDocuments(INDEX_TYPE_USER, user1); + es.putDocuments(INDEX_TYPE_USER, user2); + es.putDocuments(INDEX_TYPE_USER, user3); + es.putDocuments(INDEX_TYPE_USER, user4); // restrict results to 3 users assertThat(underTest.getAtMostThreeActiveUsersForScmAccount(email, ORGANIZATION_UUID)).hasSize(3); @@ -131,7 +122,7 @@ public class UserIndexTest { @Test public void getAtMostThreeActiveUsersForScmAccount_is_case_sensitive_for_login() { UserDoc user = newUser("the_login", singletonList("John.Smith")); - esTester.putDocuments(INDEX_TYPE_USER, user); + es.putDocuments(INDEX_TYPE_USER, user); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("the_login", ORGANIZATION_UUID)).hasSize(1); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("the_Login", ORGANIZATION_UUID)).isEmpty(); @@ -140,7 +131,7 @@ public class UserIndexTest { @Test public void getAtMostThreeActiveUsersForScmAccount_is_case_insensitive_for_email() { UserDoc user = newUser("the_login", "the_EMAIL@corp.com", singletonList("John.Smith")); - esTester.putDocuments(INDEX_TYPE_USER, user); + es.putDocuments(INDEX_TYPE_USER, user); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("the_EMAIL@corp.com", ORGANIZATION_UUID)).hasSize(1); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("the_email@corp.com", ORGANIZATION_UUID)).hasSize(1); @@ -150,7 +141,7 @@ public class UserIndexTest { @Test public void getAtMostThreeActiveUsersForScmAccount_is_case_insensitive_for_scm_account() { UserDoc user = newUser("the_login", singletonList("John.Smith")); - esTester.putDocuments(INDEX_TYPE_USER, user); + es.putDocuments(INDEX_TYPE_USER, user); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("John.Smith", ORGANIZATION_UUID)).hasSize(1); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("JOHN.SMIth", ORGANIZATION_UUID)).hasSize(1); @@ -162,16 +153,16 @@ public class UserIndexTest { public void getAtMostThreeActiveUsersForScmAccount_search_only_user_within_given_organization() { UserDoc user1 = newUser("user1", singletonList("same_scm")).setOrganizationUuids(singletonList(ORGANIZATION_UUID)); UserDoc user2 = newUser("user2", singletonList("same_scm")).setOrganizationUuids(singletonList("another_organization")); - esTester.putDocuments(INDEX_TYPE_USER, user1); - esTester.putDocuments(INDEX_TYPE_USER, user2); + es.putDocuments(INDEX_TYPE_USER, user1); + es.putDocuments(INDEX_TYPE_USER, user2); assertThat(underTest.getAtMostThreeActiveUsersForScmAccount("same_scm", ORGANIZATION_UUID)).extractingResultOf("login").containsOnly(user1.login()); } @Test public void searchUsers() { - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1")); - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, Collections.emptyList()).setEmail("email2")); + es.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1")); + es.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, Collections.emptyList()).setEmail("email2")); assertThat(underTest.search(userQuery.build(), new SearchOptions()).getDocs()).hasSize(2); assertThat(underTest.search(userQuery.setTextQuery("user").build(), new SearchOptions()).getDocs()).hasSize(2); @@ -184,9 +175,9 @@ public class UserIndexTest { @Test public void search_users_filter_by_organization_uuid() { - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1") + es.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1") .setOrganizationUuids(newArrayList("O1", "O2"))); - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, emptyList()).setEmail("email2") + es.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, emptyList()).setEmail("email2") .setOrganizationUuids(newArrayList("O2"))); assertThat(underTest.search(userQuery.setOrganizationUuid("O42").build(), new SearchOptions()).getDocs()).isEmpty(); @@ -196,9 +187,9 @@ public class UserIndexTest { @Test public void search_users_filter_by_excluded_organization_uuid() { - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1") + es.putDocuments(INDEX_TYPE_USER, newUser(USER1_LOGIN, asList("user_1", "u1")).setEmail("email1") .setOrganizationUuids(newArrayList("O1", "O2"))); - esTester.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, emptyList()).setEmail("email2") + es.putDocuments(INDEX_TYPE_USER, newUser(USER2_LOGIN, emptyList()).setEmail("email2") .setOrganizationUuids(newArrayList("O2"))); assertThat(underTest.search(userQuery.setExcludedOrganizationUuid("O42").build(), new SearchOptions()).getDocs()).hasSize(2); 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 9f653698af9..4765a5b2f5b 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,13 +51,13 @@ public class ChangePasswordActionTest { @Rule public DbTester db = DbTester.create(); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone().logIn(); private TestOrganizationFlags organizationFlags = TestOrganizationFlags.standalone(); - private UserUpdater userUpdater = new UserUpdater(mock(NewUserNotifier.class), db.getDbClient(), new UserIndexer(db.getDbClient(), esTester.client()), + private UserUpdater userUpdater = new UserUpdater(mock(NewUserNotifier.class), db.getDbClient(), new UserIndexer(db.getDbClient(), es.client()), organizationFlags, TestDefaultOrganizationProvider.from(db), mock(OrganizationCreation.class), 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 229b9cf6492..4f0b41017e5 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,14 +70,14 @@ public class CreateActionTest { @Rule public DbTester db = DbTester.create(system2); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule public ExpectedException expectedException = ExpectedException.none(); - private UserIndex index = new UserIndex(esTester.client(), System2.INSTANCE); - private UserIndexer userIndexer = new UserIndexer(db.getDbClient(), esTester.client()); + private UserIndex index = new UserIndex(es.client(), System2.INSTANCE); + private UserIndexer userIndexer = new UserIndexer(db.getDbClient(), es.client()); private GroupDto defaultGroupInDefaultOrg; private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private TestOrganizationFlags organizationFlags = TestOrganizationFlags.standalone(); 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 249611b9f85..e3115b266bb 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,15 +75,15 @@ public class DeactivateActionTest { public DbTester db = DbTester.create(system2); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); - private UserIndex index = new UserIndex(esTester.client(), system2); + private UserIndex index = new UserIndex(es.client(), system2); private DbClient dbClient = db.getDbClient(); - private UserIndexer userIndexer = new UserIndexer(dbClient, esTester.client()); + private UserIndexer userIndexer = new UserIndexer(dbClient, es.client()); private DbSession dbSession = db.getSession(); private WsActionTester ws = new WsActionTester(new DeactivateAction( 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 20d96c8bba2..cd076161c8e 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 esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSession = UserSessionRule.standalone(); @@ -64,8 +64,8 @@ public class SearchActionTest { private DbClient dbClient = db.getDbClient(); private DbSession dbSession = db.getSession(); - private UserIndex index = new UserIndex(esTester.client(), system2); - private UserIndexer userIndexer = new UserIndexer(dbClient, esTester.client()); + private UserIndex index = new UserIndex(es.client(), system2); + private UserIndexer userIndexer = new UserIndexer(dbClient, es.client()); private WsTester ws = new WsTester(new UsersWs(new SearchAction(userSession, index, dbClient, new AvatarResolverImpl()))); @Test 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 ffba3c29212..87f435c7132 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 @@ -25,23 +25,23 @@ import org.junit.Test; import org.sonar.server.es.EsTester; import static com.google.common.collect.Lists.newArrayList; -import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.server.view.index.ViewIndexDefinition.INDEX_TYPE_VIEW; public class ViewIndexTest { @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); - ViewIndex index = new ViewIndex(esTester.client()); + private ViewIndex index = new ViewIndex(es.client()); @Test public void find_all_view_uuids() { - ViewDoc view1 = new ViewDoc().setUuid("UUID1").setProjects(asList("P1")); - ViewDoc view2 = new ViewDoc().setUuid("UUID2").setProjects(asList("P2")); - esTester.putDocuments(INDEX_TYPE_VIEW, view1); - esTester.putDocuments(INDEX_TYPE_VIEW, view2); + ViewDoc view1 = new ViewDoc().setUuid("UUID1").setProjects(singletonList("P1")); + ViewDoc view2 = new ViewDoc().setUuid("UUID2").setProjects(singletonList("P2")); + es.putDocuments(INDEX_TYPE_VIEW, view1); + es.putDocuments(INDEX_TYPE_VIEW, view2); List<String> result = newArrayList(index.findAllViewUuids()); 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 9f975ab24f9..88af0fa7681 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,21 +70,21 @@ public class ViewIndexerTest { public DbTester dbTester = DbTester.create(system2); @Rule - public EsTester esTester = EsTester.core(); + public EsTester es = EsTester.core(); @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); private DbClient dbClient = dbTester.getDbClient(); private DbSession dbSession = dbTester.getSession(); - private IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); - private PermissionIndexer permissionIndexer = new PermissionIndexer(dbClient, esTester.client(), issueIndexer); - private ViewIndexer underTest = new ViewIndexer(dbClient, esTester.client()); + private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); + private PermissionIndexer permissionIndexer = new PermissionIndexer(dbClient, es.client(), issueIndexer); + private ViewIndexer underTest = new ViewIndexer(dbClient, es.client()); @Test public void index_nothing() { underTest.indexOnStartup(emptySet()); - assertThat(esTester.countDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW)).isEqualTo(0L); + assertThat(es.countDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW)).isEqualTo(0L); } @Test @@ -93,7 +93,7 @@ public class ViewIndexerTest { underTest.indexOnStartup(emptySet()); - List<ViewDoc> docs = esTester.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); + List<ViewDoc> docs = es.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); assertThat(docs).hasSize(4); Map<String, ViewDoc> viewsByUuid = Maps.uniqueIndex(docs, ViewDoc::uuid); @@ -110,7 +110,7 @@ public class ViewIndexerTest { underTest.index("EFGH"); - List<ViewDoc> docs = esTester.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); + List<ViewDoc> docs = es.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); assertThat(docs).hasSize(2); Map<String, ViewDoc> viewsByUuid = Maps.uniqueIndex(docs, ViewDoc::uuid); @@ -123,7 +123,7 @@ public class ViewIndexerTest { public void index_view_doc() { underTest.index(new ViewDoc().setUuid("EFGH").setProjects(newArrayList("KLMN", "JKLM"))); - List<ViewDoc> result = esTester.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); + List<ViewDoc> result = es.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); assertThat(result).hasSize(1); ViewDoc view = result.get(0); @@ -138,7 +138,7 @@ public class ViewIndexerTest { dbTester.components().insertComponent(newProjectCopy("PC1", project, application)); underTest.index(application.uuid()); - List<ViewDoc> result = esTester.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); + List<ViewDoc> result = es.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); assertThat(result).hasSize(1); ViewDoc resultApp = result.get(0); @@ -153,7 +153,7 @@ public class ViewIndexerTest { dbTester.components().insertComponent(newProjectCopy("PC1", project, application)); underTest.indexOnStartup(emptySet()); - List<ViewDoc> result = esTester.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); + List<ViewDoc> result = es.getDocuments(ViewIndexDefinition.INDEX_TYPE_VIEW, ViewDoc.class); assertThat(result).hasSize(1); ViewDoc resultApp = result.get(0); @@ -163,8 +163,8 @@ public class ViewIndexerTest { @Test public void clear_views_lookup_cache_on_index_view_uuid() { - IssueIndex issueIndex = new IssueIndex(esTester.client(), System2.INSTANCE, userSessionRule, new AuthorizationTypeSupport(userSessionRule)); - IssueIndexer issueIndexer = new IssueIndexer(esTester.client(), dbClient, new IssueIteratorFactory(dbClient)); + IssueIndex issueIndex = new IssueIndex(es.client(), System2.INSTANCE, userSessionRule, new AuthorizationTypeSupport(userSessionRule)); + IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbClient, new IssueIteratorFactory(dbClient)); String viewUuid = "ABCD"; @@ -206,16 +206,16 @@ public class ViewIndexerTest { ViewDoc view1 = new ViewDoc().setUuid("UUID1").setProjects(asList("P1")); ViewDoc view2 = new ViewDoc().setUuid("UUID2").setProjects(asList("P2", "P3", "P4")); ViewDoc view3 = new ViewDoc().setUuid("UUID3").setProjects(asList("P2", "P3", "P4")); - esTester.putDocuments(INDEX_TYPE_VIEW, view1); - esTester.putDocuments(INDEX_TYPE_VIEW, view2); - esTester.putDocuments(INDEX_TYPE_VIEW, view3); + es.putDocuments(INDEX_TYPE_VIEW, view1); + es.putDocuments(INDEX_TYPE_VIEW, view2); + es.putDocuments(INDEX_TYPE_VIEW, view3); - assertThat(esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) + assertThat(es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) .containsOnly(view1.uuid(), view2.uuid(), view3.uuid()); underTest.delete(dbSession, asList(view1.uuid(), view2.uuid())); - assertThat(esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) + assertThat(es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) .containsOnly(view3.uuid()); } @@ -224,26 +224,26 @@ public class ViewIndexerTest { ViewDoc view1 = new ViewDoc().setUuid("UUID1").setProjects(asList("P1")); ViewDoc view2 = new ViewDoc().setUuid("UUID2").setProjects(asList("P2", "P3", "P4")); ViewDoc view3 = new ViewDoc().setUuid("UUID3").setProjects(asList("P2", "P3", "P4")); - esTester.putDocuments(INDEX_TYPE_VIEW, view1); - esTester.putDocuments(INDEX_TYPE_VIEW, view2); - esTester.putDocuments(INDEX_TYPE_VIEW, view3); + es.putDocuments(INDEX_TYPE_VIEW, view1); + es.putDocuments(INDEX_TYPE_VIEW, view2); + es.putDocuments(INDEX_TYPE_VIEW, view3); - assertThat(esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) + assertThat(es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) .containsOnly(view1.uuid(), view2.uuid(), view3.uuid()); // Lock writes - esTester.lockWrites(INDEX_TYPE_VIEW); + es.lockWrites(INDEX_TYPE_VIEW); underTest.delete(dbSession, asList(view1.uuid(), view2.uuid())); - assertThat(esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) + assertThat(es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) .containsOnly(view1.uuid(), view2.uuid(), view3.uuid()); // Unlock writes - esTester.unlockWrites(INDEX_TYPE_VIEW); + es.unlockWrites(INDEX_TYPE_VIEW); - doRecover(() -> esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID).size() == 3); + doRecover(() -> es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID).size() == 3); - assertThat(esTester.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) + assertThat(es.getDocumentFieldValues(INDEX_TYPE_VIEW, ViewIndexDefinition.FIELD_UUID)) .containsOnly(view3.uuid()); } |