diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2017-05-02 16:28:58 +0200 |
---|---|---|
committer | Julien HENRY <henryju@yahoo.fr> | 2017-05-03 08:48:45 +0200 |
commit | 165b47c95a52c4da65210ca94703b2800fe8b272 (patch) | |
tree | c1e303a45536d6d79ff5f57d7033838af4591383 /server/sonar-ce | |
parent | 7b2958e443c4c629f3e35aba7182d7cb524b250b (diff) | |
download | sonarqube-165b47c95a52c4da65210ca94703b2800fe8b272.tar.gz sonarqube-165b47c95a52c4da65210ca94703b2800fe8b272.zip |
SONAR-8456, SONAR-8906 Cleanup properties
Diffstat (limited to 'server/sonar-ce')
-rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index e3040a61be8..4dd55fabb19 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -36,10 +36,10 @@ import org.sonar.api.CoreProperties; import org.sonar.api.database.DatabaseProperties; import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; -import org.sonar.ce.cluster.HazelcastClientWrapperImpl; -import org.sonar.ce.cluster.HazelcastTestHelper; import org.sonar.ce.CeDistributedInformationImpl; import org.sonar.ce.StandaloneCeDistributedInformation; +import org.sonar.ce.cluster.HazelcastClientWrapperImpl; +import org.sonar.ce.cluster.HazelcastTestHelper; import org.sonar.db.DbTester; import org.sonar.db.property.PropertyDto; import org.sonar.process.NetworkUtils; @@ -93,10 +93,8 @@ public class ComputeEngineContainerImplTest { assertThat( picoContainer.getComponentAdapters().stream() .map(ComponentAdapter::getComponentImplementation) - .collect(Collectors.toList()) - ).contains((Class) HazelcastClientWrapperImpl.class, - (Class) CeDistributedInformationImpl.class - ); + .collect(Collectors.toList())).contains((Class) HazelcastClientWrapperImpl.class, + (Class) CeDistributedInformationImpl.class); underTest.stop(); } @@ -139,17 +137,14 @@ public class ComputeEngineContainerImplTest { + 23 // level 1 + 46 // content of DaoModule + 3 // content of EsSearchModule - + 57 // content of CorePropertyDefinitions + + 56 // content of CorePropertyDefinitions ); assertThat( picoContainer.getComponentAdapters().stream() .map(ComponentAdapter::getComponentImplementation) - .collect(Collectors.toList()) - ).doesNotContain((Class) HazelcastClientWrapperImpl.class, - (Class) CeDistributedInformationImpl.class - ).contains( - (Class) StandaloneCeDistributedInformation.class - ); + .collect(Collectors.toList())).doesNotContain((Class) HazelcastClientWrapperImpl.class, + (Class) CeDistributedInformationImpl.class).contains( + (Class) StandaloneCeDistributedInformation.class); assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull(); underTest.stop(); |