diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2018-10-19 13:44:36 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-11-16 20:21:03 +0100 |
| commit | bcddd9658c7eea3bb5576bece3a0c2b985a7d506 (patch) | |
| tree | c5c757aa909a9db2e6cc52af68bc77a661a33b28 /server/sonar-ce | |
| parent | f61d654f7d74036f50f2a1ca6b380a437ec911a2 (diff) | |
| download | sonarqube-bcddd9658c7eea3bb5576bece3a0c2b985a7d506.tar.gz sonarqube-bcddd9658c7eea3bb5576bece3a0c2b985a7d506.zip | |
SONAR-11321 Bind organization to alm installation when creating organization
* Return AlmAppInstallDto in select methods of AlmAppInstallDao, this is required in order to be able to more easily link an OrganizationDto to a AlmAppInstallDto in next commit
* Create ORGANIZATION_ALM_BINDINGS table
* Bind organization with installation when creating organization
* Delete alm binding when removing organization
* Delete alm binding when uninstalling ALM application
* Return ALM info in api/organizations/search
* Ensure user is admin to return Bitbucket team/user details
Diffstat (limited to 'server/sonar-ce')
| -rw-r--r-- | server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java | 4 |
1 files changed, 2 insertions, 2 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 abc064e3142..c4e1ff35582 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 @@ -108,7 +108,7 @@ public class ComputeEngineContainerImplTest { + 3 // CeCleaningModule + its content + 4 // WebhookModule + 1 // CeDistributedInformation - ); + ); assertThat(picoContainer.getParent().getComponentAdapters()).hasSize( CONTAINER_ITSELF + 8 // level 3 @@ -121,7 +121,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize( COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION + 26 // level 1 - + 57 // content of DaoModule + + 58 // content of DaoModule + 3 // content of EsModule + 54 // content of CorePropertyDefinitions + 1 // StopFlagContainer |