From 04f939b173d85477f4fb3086fc57a2401c03a9c9 Mon Sep 17 00:00:00 2001
From: NOUMANE <ahmed.noumane@xelians.fr>
Date: Fri, 4 Dec 2020 18:19:19 +0100
Subject: [PATCH] [US TRTL-526] update footer with release version
---
.../config/UICommonsAutoConfiguration.java | 10 +--------
.../UICommonsAutoConfigurationTest.java | 22 ++++++-------------
.../UICommonsAutoSpringMockConfiguration.java | 15 ++++++++-----
.../rest/ApplicationControllerTest.java | 9 --------
.../commons/rest/SecurityControllerTest.java | 12 ++++------
.../rest/SubrogationControllerTest.java | 19 ++++++----------
.../ui/commons/rest/UserControllerTest.java | 11 ++++------
.../components/footer/footer.component.html | 4 ++--
.../components/footer/footer.component.scss | 14 +-----------
.../components/footer/footer.component.ts | 8 +++----
ui/ui-frontend-common/src/sass/_theme.scss | 6 +++++
.../user/user-list/user-list.component.html | 1 +
.../config/IdentityContextConfiguration.java | 5 +++--
.../identity/rest/CustomerControllerTest.java | 5 +++++
.../identity/rest/OwnerControllerTest.java | 4 ++++
.../identity/rest/ProfileControllerTest.java | 4 ++++
.../identity/rest/ProviderControllerTest.java | 5 +++++
.../identity/rest/SecurityControllerTest.java | 5 +++++
.../rest/SubrogationControllerTest.java | 4 ++++
.../identity/rest/TenantControllerTest.java | 4 ++++
.../identity/rest/UserControllerTest.java | 5 +++++
.../portal/rest/SecurityControllerTest.java | 5 +++++
.../rest/SubrogationControllerTest.java | 5 +++++
23 files changed, 94 insertions(+), 88 deletions(-)
diff --git a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfiguration.java b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfiguration.java
index b2725404f..6ed6b8147 100644
--- a/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfiguration.java
+++ b/ui/ui-commons/src/main/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfiguration.java
@@ -36,11 +36,8 @@
*/
package fr.gouv.vitamui.ui.commons.config;
-import java.util.Properties;
-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -64,15 +61,10 @@ public class UICommonsAutoConfiguration {
public UIProperties uiProperties() {
throw new InternalServerException("You must define ui properties");
}
- @Bean
- @ConditionalOnMissingBean
- public BuildProperties buildProperties() {
- throw new InternalServerException("You must define buildProperties");
- }
@Bean
@ConditionalOnMissingBean
- @DependsOn(value = { "uiProperties", "buildProperties" })
+ @DependsOn("uiProperties")
public IamExternalRestClientFactory iamRestClientFactory(final UIProperties uiProperties, final RestTemplateBuilder restTemplateBuilder) {
return new IamExternalRestClientFactory(uiProperties.getIamExternalClient(), restTemplateBuilder);
}
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfigurationTest.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfigurationTest.java
index 303871054..5a60b4a99 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfigurationTest.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoConfigurationTest.java
@@ -2,12 +2,9 @@ package fr.gouv.vitamui.ui.commons.config;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.Properties;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -25,10 +22,11 @@ import fr.gouv.vitamui.ui.commons.service.ApplicationService;
@RunWith(SpringJUnit4ClassRunner.class)
public class UICommonsAutoConfigurationTest {
- private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(UICommonsAutoConfiguration.class))
- .withConfiguration(AutoConfigurations.of(UICommonsAutoSpringMockConfiguration.class))
- .withSystemProperties("controller.subrogation.enabled=true", "controller.user.enabled=true");
+
+ private final ApplicationContextRunner contextRunner =
+ new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(UICommonsAutoConfiguration.class))
+ .withConfiguration(AutoConfigurations.of(UICommonsAutoSpringMockConfiguration.class))
+ .withSystemProperties("controller.subrogation.enabled=true", "controller.user.enabled=true");
@Test
public void serviceNameCanBeConfigured() {
@@ -44,6 +42,7 @@ public class UICommonsAutoConfigurationTest {
@Configuration
static class UserConfiguration {
+
@Bean
public UIProperties uiProperties() {
final UIPropertiesImpl properties = new UIPropertiesImpl();
@@ -57,13 +56,6 @@ public class UICommonsAutoConfigurationTest {
return casBean;
}
- @Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
- }
-
-
}
+
}
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoSpringMockConfiguration.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoSpringMockConfiguration.java
index b2518c195..fba13c17a 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoSpringMockConfiguration.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/config/UICommonsAutoSpringMockConfiguration.java
@@ -11,14 +11,17 @@ import org.springframework.context.annotation.Configuration;
public class UICommonsAutoSpringMockConfiguration {
@Bean
- public RestTemplateBuilder restTemplateBuilder() {
- return new RestTemplateBuilder();
+ public BuildProperties buildProperties() {
+ Properties properties = new Properties();
+ properties.put("group", "fr.gouv.vitamui.ui");
+ properties.put("artifact", "test");
+ properties.put("version", "2.0.0");
+ return new BuildProperties(properties);
}
+
@Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
+ public RestTemplateBuilder restTemplateBuilder() {
+ return new RestTemplateBuilder();
}
}
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/ApplicationControllerTest.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/ApplicationControllerTest.java
index 4c44d5a48..7903f420e 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/ApplicationControllerTest.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/ApplicationControllerTest.java
@@ -1,11 +1,8 @@
package fr.gouv.vitamui.ui.commons.rest;
-import java.util.Properties;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -42,12 +39,6 @@ public class ApplicationControllerTest extends UIControllerTest<ApplicationDto>
properties.setIamExternalClient(new RestClientConfiguration());
return properties;
}
- @Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
- }
}
protected String apiUrl = "/ui-api/ui";
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SecurityControllerTest.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SecurityControllerTest.java
index e86e46a16..728df921d 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SecurityControllerTest.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SecurityControllerTest.java
@@ -18,6 +18,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -39,14 +40,6 @@ public class SecurityControllerTest extends UIControllerTest<UserDto> {
properties.setIamExternalClient(new RestClientConfiguration());
return properties;
}
-
- @Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
- }
-
}
@Value("${ui-prefix}")
@@ -56,6 +49,9 @@ public class SecurityControllerTest extends UIControllerTest<UserDto> {
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SecurityControllerTest.class);
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testGetUserConnected() throws Exception {
preparedServices();
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SubrogationControllerTest.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SubrogationControllerTest.java
index 194b5e81f..d8e8b0025 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SubrogationControllerTest.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/SubrogationControllerTest.java
@@ -3,8 +3,6 @@ package fr.gouv.vitamui.ui.commons.rest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import java.util.Properties;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -31,9 +29,9 @@ import fr.gouv.vitamui.ui.commons.security.SecurityConfig;
import fr.gouv.vitamui.ui.commons.service.SubrogationService;
@RunWith(SpringJUnit4ClassRunner.class)
-@ImportAutoConfiguration(classes = { UICommonsAutoConfiguration.class, UICommonsAutoSpringMockConfiguration.class })
-@WebMvcTest(controllers = { SubrogationController.class })
-@Import(value = { SecurityConfig.class, ServerIdentityConfiguration.class })
+@ImportAutoConfiguration(classes = {UICommonsAutoConfiguration.class, UICommonsAutoSpringMockConfiguration.class})
+@WebMvcTest(controllers = {SubrogationController.class})
+@Import(value = {SecurityConfig.class, ServerIdentityConfiguration.class})
public class SubrogationControllerTest extends UIControllerTest<SubrogationDto> {
@TestConfiguration
@@ -47,13 +45,6 @@ public class SubrogationControllerTest extends UIControllerTest<SubrogationDto>
}
- @Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
- }
-
}
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SubrogationControllerTest.class);
@@ -69,6 +60,9 @@ public class SubrogationControllerTest extends UIControllerTest<SubrogationDto>
@MockBean
private SubrogationService service;
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testSubrogationControllerEnabled() {
assertThat(subrogationEnabled).isTrue();
@@ -124,4 +118,5 @@ public class SubrogationControllerTest extends UIControllerTest<SubrogationDto>
Mockito.when(service.create(any(), any(SubrogationDto.class))).thenReturn(new SubrogationDto());
Mockito.when(service.getOne(any(), any(), any())).thenReturn(new SubrogationDto());
}
+
}
diff --git a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/UserControllerTest.java b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/UserControllerTest.java
index 3c455aed8..962f3cd0e 100644
--- a/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/UserControllerTest.java
+++ b/ui/ui-commons/src/test/java/fr/gouv/vitamui/ui/commons/rest/UserControllerTest.java
@@ -6,7 +6,6 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.util.Map;
-import java.util.Properties;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,12 +62,10 @@ public class UserControllerTest extends UIControllerTest<UserDto> {
properties.setIamExternalClient(new RestClientConfiguration());
return properties;
}
- @Bean
- public BuildProperties buildProperties() {
- Properties props = new Properties();
- props.put("version.release", "0.0.0");
- return new BuildProperties(props);
- }
+
+
+ @MockBean
+ private BuildProperties buildProperties;
}
diff --git a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.html b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.html
index ad0b43595..df17b5a61 100644
--- a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.html
+++ b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.html
@@ -1,4 +1,4 @@
<div class="d-flex flex-column align-items-center">
- <img alt="compagny logo" [src]="footerLogoUrl" class="logo"/>
- <span class="version">{{version}}</span>
+ <div><img alt="compagny logo" [src]="footerLogoUrl" class="logo"/></div>
+ <div class="text normal letter-spacing text-primary-300">{{version}}</div>
</div>
diff --git a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.scss b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.scss
index 4cd629f5a..2bbd1c70f 100644
--- a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.scss
+++ b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.scss
@@ -1,21 +1,9 @@
-@import "../../../../sass/variables/colors";
-
-$text-color: $white;
-
:host {
display: flex;
flex-wrap: wrap;
width: 100%;
height: 100px;
- background-color: $white;
+ background-color: var(--vitamui-background);
align-items: center;
justify-content: center;
- color: $text-color;
-}
-
-.version {
- font-size: 12px;
- line-height: 16px;
- letter-spacing: 0.4px;
- color: var(--vitamui-primary-300);
}
diff --git a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.ts b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.ts
index 4f8c3da87..3af26b56e 100644
--- a/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.ts
+++ b/ui/ui-frontend-common/src/app/modules/components/footer/footer.component.ts
@@ -12,7 +12,7 @@ import { ThemeService } from '../../theme.service';
})
export class FooterComponent implements OnInit {
public footerLogoUrl: SafeResourceUrl;
- public version = 'v';
+ public version: string;
constructor(
private startupService: StartupService,
@@ -21,11 +21,9 @@ export class FooterComponent implements OnInit {
) {}
ngOnInit() {
- const versionRelease = this.startupService.getConfigStringValue(
- 'VERSION_RELEASE'
- );
+ const versionRelease = this.startupService.getConfigStringValue( 'VERSION_RELEASE');
if (versionRelease) {
- this.version = this.version + versionRelease;
+ this.version = 'v' + versionRelease;
}
this.footerLogoUrl = this.themeService.getData(
this.authService.user,
diff --git a/ui/ui-frontend-common/src/sass/_theme.scss b/ui/ui-frontend-common/src/sass/_theme.scss
index 0932cbe4d..dcbcd20b4 100644
--- a/ui/ui-frontend-common/src/sass/_theme.scss
+++ b/ui/ui-frontend-common/src/sass/_theme.scss
@@ -59,6 +59,12 @@ body {
color: var(--vitamui-primary)!important;
}
+.text-primary-300 {
+ color: var(--vitamui-primary-300)!important;
+}
+
+
+
.text-secondary {
color: var(--vitamui-secondary)!important;
}
diff --git a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
index 6dbd17524..c3bee067d 100644
--- a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
@@ -143,3 +143,4 @@
<div class="vitamui-min-content">
<mat-spinner class="vitamui-spinner medium"></mat-spinner>
</div>
+</ng-template>
diff --git a/ui/ui-identity/src/main/java/fr/gouv/vitamui/identity/config/IdentityContextConfiguration.java b/ui/ui-identity/src/main/java/fr/gouv/vitamui/identity/config/IdentityContextConfiguration.java
index 1e9fe20c7..06d9aca21 100644
--- a/ui/ui-identity/src/main/java/fr/gouv/vitamui/identity/config/IdentityContextConfiguration.java
+++ b/ui/ui-identity/src/main/java/fr/gouv/vitamui/identity/config/IdentityContextConfiguration.java
@@ -53,13 +53,14 @@ import fr.gouv.vitamui.ui.commons.security.SecurityConfig;
@Configuration
@EnableConfigurationProperties
-@Import(value = { SecurityConfig.class, SwaggerConfiguration.class, RestExceptionHandler.class })
+@Import(value = {SecurityConfig.class, SwaggerConfiguration.class, RestExceptionHandler.class})
public class IdentityContextConfiguration extends AbstractContextConfiguration {
@Bean
@ConditionalOnMissingBean
- @DependsOn(value = { "uiProperties", "buildProperties" })
+ @DependsOn("uiProperties")
public IamExternalWebClientFactory iamWebClientFactory(final UIProperties uiProperties, final WebClient.Builder webClientBuilder) {
return new IamExternalWebClientFactory(uiProperties.getIamExternalClient(), webClientBuilder);
}
+
}
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/CustomerControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/CustomerControllerTest.java
index 135b05ef9..9f1375c5c 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/CustomerControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/CustomerControllerTest.java
@@ -14,6 +14,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -36,6 +37,10 @@ public class CustomerControllerTest extends UiIdentityRestControllerTest<Custome
private static final String PREFIX = "/customers";
+ @MockBean
+ private BuildProperties buildProperties;
+
+
@Test
public void testGetCustomer() throws Exception {
super.testGetEntityById();
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/OwnerControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/OwnerControllerTest.java
index f7ca2fa1e..3c739348d 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/OwnerControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/OwnerControllerTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -29,6 +30,9 @@ public class OwnerControllerTest extends UiIdentityRestControllerTest<OwnerDto>
private static final String PREFIX = "/owners";
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testCreateOwner() {
super.testCreateEntity();
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProfileControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProfileControllerTest.java
index bce30eea5..645424a2c 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProfileControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProfileControllerTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -19,6 +20,9 @@ import fr.gouv.vitamui.identity.service.ProfileService;
@WebMvcTest(controllers = { ProfileController.class })
public class ProfileControllerTest extends UiIdentityRestControllerTest<ProfileDto> {
+ @MockBean
+ private BuildProperties buildProperties;
+
@Value("${ui-identity.prefix}")
protected String apiUrl;
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProviderControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProviderControllerTest.java
index 60164bdbb..6a9d0608f 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProviderControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/ProviderControllerTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.MediaType;
@@ -33,6 +34,10 @@ public class ProviderControllerTest extends UiIdentityRestControllerTest<Identit
@MockBean
private ProviderService service;
+ @MockBean
+ private BuildProperties buildProperties;
+
+
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(ProviderControllerTest.class);
private static final String PREFIX = "/providers";
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SecurityControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SecurityControllerTest.java
index d888e2621..18f90167d 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SecurityControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SecurityControllerTest.java
@@ -4,7 +4,9 @@ import fr.gouv.vitamui.commons.api.domain.UserDto;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
@@ -22,6 +24,9 @@ public class SecurityControllerTest extends UiIdentityRestControllerTest<UserDto
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SecurityControllerTest.class);
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testGetUserConnected() throws Exception {
super.testGetAllEntity();
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SubrogationControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SubrogationControllerTest.java
index 13627fd5d..447f64cc9 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SubrogationControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/SubrogationControllerTest.java
@@ -7,6 +7,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
@@ -39,6 +40,9 @@ public class SubrogationControllerTest extends UIControllerTest<SubrogationDto>
@MockBean
private SubrogationService service;
+ @MockBean
+ private BuildProperties buildProperties;
+
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SubrogationControllerTest.class);
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/TenantControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/TenantControllerTest.java
index 8b499e42a..8cf47d007 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/TenantControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/TenantControllerTest.java
@@ -42,6 +42,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -70,6 +71,9 @@ public class TenantControllerTest extends UiIdentityRestControllerTest<TenantDto
private static final String PREFIX = "/tenants";
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testCreateTenant() {
super.testCreateEntity();
diff --git a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/UserControllerTest.java b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/UserControllerTest.java
index ea7bfef83..5bcc47ebf 100644
--- a/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/UserControllerTest.java
+++ b/ui/ui-identity/src/test/java/fr/gouv/vitamui/identity/rest/UserControllerTest.java
@@ -12,6 +12,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpHeaders;
@@ -39,6 +40,10 @@ public class UserControllerTest extends UiIdentityRestControllerTest<UserDto> {
super.testCreateEntity();
}
+ @MockBean
+ private BuildProperties buildProperties;
+
+
@Test
public void testUpdateUser() {
super.testUpdateEntity();
diff --git a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SecurityControllerTest.java b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SecurityControllerTest.java
index 1f3818833..2da393164 100644
--- a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SecurityControllerTest.java
+++ b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SecurityControllerTest.java
@@ -4,7 +4,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -34,6 +36,9 @@ public class SecurityControllerTest extends UIControllerTest<UserDto> {
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SecurityControllerTest.class);
+ @MockBean
+ private BuildProperties buildProperties;
+
@Test
public void testGetUserConnected() throws Exception {
super.testGetAllEntity();
diff --git a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SubrogationControllerTest.java b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SubrogationControllerTest.java
index 40ec235a7..7c161d3c9 100644
--- a/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SubrogationControllerTest.java
+++ b/ui/ui-portal/src/test/java/fr/gouv/vitamui/portal/rest/SubrogationControllerTest.java
@@ -16,6 +16,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
@@ -41,6 +42,10 @@ public class SubrogationControllerTest extends UIControllerTest<SubrogationDto>
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(SubrogationControllerTest.class);
+ @MockBean
+ private BuildProperties buildProperties;
+
+
@Test
public void testGetSubrogationById() {
super.testGetEntityById();
--
GitLab