diff --git a/layout-packaging/pom.xml b/layout-packaging/pom.xml index ba453585c..eb6caacca 100644 --- a/layout-packaging/pom.xml +++ b/layout-packaging/pom.xml @@ -27,7 +27,7 @@ io.meeds.layout layout - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT layout-packaging pom diff --git a/layout-service/pom.xml b/layout-service/pom.xml index eccfe6b16..518d63752 100644 --- a/layout-service/pom.xml +++ b/layout-service/pom.xml @@ -27,7 +27,7 @@ io.meeds.layout layout - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT layout-service jar @@ -45,6 +45,17 @@ social-component-service + + org.springframework.security + spring-security-test + test + + + com.vaadin.external.google + android-json + + + org.springframework.boot spring-boot-starter-test @@ -56,6 +67,17 @@ + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + com.vaadin.external.google + android-json + + + ${project.artifactId} diff --git a/layout-service/src/main/resources/jpa-entities.idx b/layout-service/src/main/resources/jpa-entities.idx index 975ff0707..cc3f05566 100644 --- a/layout-service/src/main/resources/jpa-entities.idx +++ b/layout-service/src/main/resources/jpa-entities.idx @@ -1,3 +1,4 @@ io.meeds.layout.entity.PageTemplateEntity io.meeds.layout.entity.PortletInstanceEntity io.meeds.layout.entity.PortletInstanceCategoryEntity +io.meeds.layout.entity.SectionTemplateEntity diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/PageTemplateDatabindPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/PageTemplateDatabindPluginTest.java index 1474045b2..3de6be180 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/PageTemplateDatabindPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/PageTemplateDatabindPluginTest.java @@ -41,7 +41,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.social.attachment.AttachmentService; @@ -58,28 +58,28 @@ @ExtendWith(MockitoExtension.class) class PageTemplateDatabindPluginTest { - @MockBean + @MockitoBean private PageTemplateService pageTemplateService; - @MockBean + @MockitoBean private DatabindService databindService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/PortletInstanceDatabindPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/PortletInstanceDatabindPluginTest.java index ba2a664ab..086819f9a 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/PortletInstanceDatabindPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/PortletInstanceDatabindPluginTest.java @@ -38,7 +38,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.services.security.Identity; import org.exoplatform.social.attachment.AttachmentService; @@ -59,25 +59,25 @@ class PortletInstanceDatabindPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean private DatabindService databindService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/SectionTemplateDatabindPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/SectionTemplateDatabindPluginTest.java index ce9e6323f..577d5a1f0 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/SectionTemplateDatabindPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/SectionTemplateDatabindPluginTest.java @@ -47,7 +47,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.file.services.FileService; import org.exoplatform.portal.config.UserACL; @@ -62,37 +62,37 @@ @ExtendWith(MockitoExtension.class) class SectionTemplateDatabindPluginTest { - @MockBean + @MockitoBean private SectionTemplateService sectionTemplateService; - @MockBean + @MockitoBean private DatabindService databindService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private PageLayoutService pageLayoutService; - @MockBean + @MockitoBean private ContainerLayoutService containerLayoutService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/SiteTemplateDatabindPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/SiteTemplateDatabindPluginTest.java index 12d68d92e..b22320830 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/SiteTemplateDatabindPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/SiteTemplateDatabindPluginTest.java @@ -53,7 +53,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.file.services.FileService; import org.exoplatform.portal.config.UserACL; @@ -74,43 +74,43 @@ class SiteTemplateDatabindPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private SiteTemplateService siteTemplateService; - @MockBean + @MockitoBean LayoutService layoutService; - @MockBean + @MockitoBean private DatabindService databindService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean private NavigationLayoutService navigationLayoutService; - @MockBean + @MockitoBean DescriptionService descriptionService; - @MockBean + @MockitoBean PageLayoutService pageLayoutService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/SpaceNavigationDatabindPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/SpaceNavigationDatabindPluginTest.java index 26a332778..e11401aa2 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/SpaceNavigationDatabindPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/SpaceNavigationDatabindPluginTest.java @@ -49,7 +49,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.file.services.FileService; import org.exoplatform.portal.config.UserACL; @@ -70,43 +70,43 @@ class SpaceNavigationDatabindPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean protected DatabindService databindService; - @MockBean + @MockitoBean protected FileService fileService; - @MockBean + @MockitoBean protected TranslationService translationService; - @MockBean + @MockitoBean protected SpaceTemplateService spaceTemplateService; - @MockBean + @MockitoBean protected AttachmentService attachmentService; - @MockBean + @MockitoBean LayoutService layoutService; - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean DescriptionService descriptionService; - @MockBean + @MockitoBean private NavigationLayoutService navigationLayoutService; - @MockBean + @MockitoBean private PageLayoutService pageLayoutService; - @MockBean + @MockitoBean PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean protected UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/CmsPortletAttachmentPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/CmsPortletAttachmentPluginTest.java index 39823f227..e2fbfb893 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/CmsPortletAttachmentPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/CmsPortletAttachmentPluginTest.java @@ -30,7 +30,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -44,13 +44,13 @@ @ExtendWith(MockitoExtension.class) class CmsPortletAttachmentPluginTest { - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PageTemplateAttachmentPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PageTemplateAttachmentPluginTest.java index 362b0f9ad..bc892292d 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PageTemplateAttachmentPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PageTemplateAttachmentPluginTest.java @@ -29,7 +29,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.services.security.Identity; import org.exoplatform.social.attachment.AttachmentService; @@ -47,10 +47,10 @@ public class PageTemplateAttachmentPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PortletInstanceAttachmentPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PortletInstanceAttachmentPluginTest.java index f7886a5dd..f2992a38d 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PortletInstanceAttachmentPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/PortletInstanceAttachmentPluginTest.java @@ -33,7 +33,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.services.security.Identity; @@ -54,13 +54,13 @@ public class PortletInstanceAttachmentPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SectionTemplateAttachmentPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SectionTemplateAttachmentPluginTest.java index 18761e6e9..f06e174ce 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SectionTemplateAttachmentPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SectionTemplateAttachmentPluginTest.java @@ -29,7 +29,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.services.security.Identity; import org.exoplatform.social.attachment.AttachmentService; @@ -48,13 +48,13 @@ public class SectionTemplateAttachmentPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private SectionTemplateService sectionTemplateService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SiteTemplateAttachmentPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SiteTemplateAttachmentPluginTest.java index 19caf9812..1d7ca01a1 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SiteTemplateAttachmentPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/attachment/SiteTemplateAttachmentPluginTest.java @@ -29,7 +29,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.services.security.Identity; import org.exoplatform.social.attachment.AttachmentService; @@ -48,13 +48,13 @@ public class SiteTemplateAttachmentPluginTest { @Mock private Identity userIdentity; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private SiteTemplateService siteTemplateService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/container/PortletInstanceApplicationAdapterTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/container/PortletInstanceApplicationAdapterTest.java index 59793236f..33555cff0 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/container/PortletInstanceApplicationAdapterTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/container/PortletInstanceApplicationAdapterTest.java @@ -35,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.portal.application.PortalRequestContext; @@ -56,7 +56,7 @@ public class PortletInstanceApplicationAdapterTest { private static final String USERNAME = "username"; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/renderer/LoginFormPortletInstancePreferencePluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/renderer/LoginFormPortletInstancePreferencePluginTest.java index 562bf278a..8a3f704e3 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/renderer/LoginFormPortletInstancePreferencePluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/renderer/LoginFormPortletInstancePreferencePluginTest.java @@ -33,7 +33,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.io.File; import java.util.HashMap; @@ -60,13 +60,13 @@ public class LoginFormPortletInstancePreferencePluginTest { @Autowired private LoginFormPortletInstancePreferencePlugin loginFormPortletInstancePreferencePlugin; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private AttachmentService attachmentService; @BeforeEach diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/renderer/SidebarLoginFormPortletInstancePreferencePluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/renderer/SidebarLoginFormPortletInstancePreferencePluginTest.java index 398389d1e..d60f67899 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/renderer/SidebarLoginFormPortletInstancePreferencePluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/renderer/SidebarLoginFormPortletInstancePreferencePluginTest.java @@ -30,7 +30,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import java.util.HashMap; import java.util.List; @@ -49,13 +49,13 @@ public class SidebarLoginFormPortletInstancePreferencePluginTest { private static final String SETTING_NAME = "name"; private static final String DATA_INIT_PREFERENCE_NAME = "data.init"; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private AttachmentService attachmentService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/CmsPortletTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/CmsPortletTranslationPluginTest.java index d13b23d0f..367c73c0c 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/CmsPortletTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/CmsPortletTranslationPluginTest.java @@ -26,7 +26,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -39,10 +39,10 @@ @ExtendWith(MockitoExtension.class) class CmsPortletTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PageTemplateTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PageTemplateTranslationPluginTest.java index 4eed9338c..41375f8e7 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PageTemplateTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PageTemplateTranslationPluginTest.java @@ -28,7 +28,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import io.meeds.layout.service.LayoutAclService; import io.meeds.social.translation.service.TranslationService; @@ -41,10 +41,10 @@ @ExtendWith(MockitoExtension.class) public class PageTemplateTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceCategoryTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceCategoryTranslationPluginTest.java index 223862cce..4953c6180 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceCategoryTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceCategoryTranslationPluginTest.java @@ -32,7 +32,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -49,13 +49,13 @@ @ExtendWith(MockitoExtension.class) public class PortletInstanceCategoryTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceCategoryService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceTranslationPluginTest.java index 7aecde826..db733a935 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/PortletInstanceTranslationPluginTest.java @@ -32,7 +32,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -49,13 +49,13 @@ @ExtendWith(MockitoExtension.class) public class PortletInstanceTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/SectionTemplateTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/SectionTemplateTranslationPluginTest.java index e107c28c6..49dd4ec36 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/SectionTemplateTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/SectionTemplateTranslationPluginTest.java @@ -28,7 +28,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import io.meeds.layout.service.LayoutAclService; import io.meeds.layout.service.SectionTemplateService; @@ -42,13 +42,13 @@ @ExtendWith(MockitoExtension.class) public class SectionTemplateTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private SectionTemplateService sectionTemplateService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/plugin/translation/SiteTemplateTranslationPluginTest.java b/layout-service/src/test/java/io/meeds/layout/plugin/translation/SiteTemplateTranslationPluginTest.java index eab0df197..35e3c18e6 100644 --- a/layout-service/src/test/java/io/meeds/layout/plugin/translation/SiteTemplateTranslationPluginTest.java +++ b/layout-service/src/test/java/io/meeds/layout/plugin/translation/SiteTemplateTranslationPluginTest.java @@ -28,7 +28,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import io.meeds.layout.service.LayoutAclService; import io.meeds.layout.service.SiteTemplateService; @@ -42,13 +42,13 @@ @ExtendWith(MockitoExtension.class) public class SiteTemplateTranslationPluginTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private SiteTemplateService siteTemplateService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/PageTemplateRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/PageTemplateRestTest.java index 1a4e725dc..b10e90778 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/PageTemplateRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/PageTemplateRestTest.java @@ -38,10 +38,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -75,10 +75,10 @@ public class PageTemplateRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private PageTemplateService pageTemplateService; - @MockBean + @MockitoBean private PageTemplateImportService pageTemplateImportService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceCategoryRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceCategoryRestTest.java index ed4280e60..50c6a61c6 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceCategoryRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceCategoryRestTest.java @@ -38,10 +38,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -74,7 +74,7 @@ public class PortletInstanceCategoryRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceRestTest.java index 4cb38905d..e4d68c1ae 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/PortletInstanceRestTest.java @@ -39,10 +39,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -75,7 +75,7 @@ public class PortletInstanceRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/PortletRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/PortletRestTest.java index cb0adebcb..a2f52c26f 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/PortletRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/PortletRestTest.java @@ -29,10 +29,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; import org.springframework.test.context.ContextConfiguration; @@ -61,7 +61,7 @@ public class PortletRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private PortletService portletService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/SectionTemplateRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/SectionTemplateRestTest.java index f2a460f24..85cd78622 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/SectionTemplateRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/SectionTemplateRestTest.java @@ -37,10 +37,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -74,10 +74,10 @@ public class SectionTemplateRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private SectionTemplateService sectionTemplateService; - @MockBean + @MockitoBean private SectionTemplateImportService sectionTemplateImportService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/SiteLayoutRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/SiteLayoutRestTest.java index aed8d5991..8c0131391 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/SiteLayoutRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/SiteLayoutRestTest.java @@ -36,10 +36,10 @@ import org.mockito.MockedStatic; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -102,10 +102,10 @@ public class SiteLayoutRestTest { private static final String RESTORE_LAYOUT_PARAMS = "siteType=DRAFT&siteName=" + SITE_NAME + "&importMode=INSERT&siteLayout=true&pagesLayout=true&navigation=true"; - @MockBean + @MockitoBean private SiteLayoutService siteLayoutService; - @MockBean + @MockitoBean private LayoutService layoutService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/rest/SiteTemplateRestTest.java b/layout-service/src/test/java/io/meeds/layout/rest/SiteTemplateRestTest.java index 33d03b1bb..3855a3866 100644 --- a/layout-service/src/test/java/io/meeds/layout/rest/SiteTemplateRestTest.java +++ b/layout-service/src/test/java/io/meeds/layout/rest/SiteTemplateRestTest.java @@ -37,10 +37,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.web.SecurityFilterChain; @@ -73,7 +73,7 @@ public class SiteTemplateRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private SiteTemplateService siteTemplateService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/ContainerLayoutServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/ContainerLayoutServiceTest.java index 20e4d6b79..6ab054e2f 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/ContainerLayoutServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/ContainerLayoutServiceTest.java @@ -37,7 +37,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.file.model.FileInfo; import org.exoplatform.commons.file.model.FileItem; @@ -69,25 +69,25 @@ class ContainerLayoutServiceTest { private static final long PAGE_ID = 58L; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private UploadService uploadService; - @MockBean + @MockitoBean private FileService fileService; - @MockBean + @MockitoBean private UserACL userAcl; - @MockBean + @MockitoBean private IdentityManager identityManager; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/service/LayoutAclServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/LayoutAclServiceTest.java index 6e05c71f5..152e5247e 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/LayoutAclServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/LayoutAclServiceTest.java @@ -29,7 +29,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.model.Page; @@ -50,13 +50,13 @@ public class LayoutAclServiceTest { private static final PageKey PAGE_KEY = PageKey.parse("portal::test::test"); - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private IdentityManager identityManager; - @MockBean + @MockitoBean private UserACL userAcl; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/NavigationLayoutServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/NavigationLayoutServiceTest.java index 273c00cbf..c2cb89408 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/NavigationLayoutServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/NavigationLayoutServiceTest.java @@ -42,7 +42,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.portal.mop.SiteKey; @@ -74,28 +74,28 @@ public class NavigationLayoutServiceTest { private static final PageKey PAGE_KEY = PageKey.parse("portal::test::test"); - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private PageLayoutService pageLayoutService; - @MockBean + @MockitoBean private DescriptionService descriptionService; - @MockBean + @MockitoBean private LayoutAclService aclService; - @MockBean + @MockitoBean private WebAppController webController; - @MockBean + @MockitoBean private ResourceBundleManager resourceBundleManager; - @MockBean + @MockitoBean private LocaleConfigService localeConfigService; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/service/PageLayoutServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/PageLayoutServiceTest.java index 86d04583f..131514b1f 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/PageLayoutServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/PageLayoutServiceTest.java @@ -43,7 +43,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.addons.AddOnService; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -88,25 +88,25 @@ public class PageLayoutServiceTest { private static final PageKey PAGE_KEY = PageKey.parse("portal::test::test"); - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private LayoutAclService aclService; - @MockBean + @MockitoBean private PageTemplateService pageTemplateService; - @MockBean + @MockitoBean private UserPortalConfigService userPortalConfigService; - @MockBean + @MockitoBean private AddOnService addOnService; - @MockBean + @MockitoBean private ContainerLayoutService containerLayoutService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/PageTemplateServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/PageTemplateServiceTest.java index c2a39e85c..07621933d 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/PageTemplateServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/PageTemplateServiceTest.java @@ -42,7 +42,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.services.resources.LocaleConfig; @@ -66,19 +66,19 @@ public class PageTemplateServiceTest { private static final String LAYOUT_CATEGORY = "CATEGORY"; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LocaleConfigService localeConfigService; - @MockBean + @MockitoBean private PageTemplateStorage pageTemplateStorage; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceRenderServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceRenderServiceTest.java index 6b8d4bdfc..5864b0a43 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceRenderServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceRenderServiceTest.java @@ -35,7 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.api.settings.SettingService; import org.exoplatform.commons.api.settings.SettingValue; @@ -64,13 +64,13 @@ public class PortletInstanceRenderServiceTest { private static final String CONTENT_ID = "test/content"; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private LayoutService layoutService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java index 7df870cde..6486d16cf 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/PortletInstanceServiceTest.java @@ -44,7 +44,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.portal.config.model.Application; @@ -82,34 +82,34 @@ public class PortletInstanceServiceTest { private static final String USERNAME = "test"; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LocaleConfigService localeConfigService; - @MockBean + @MockitoBean private PortletInstanceCategoryStorage portletInstanceCategoryStorage; - @MockBean + @MockitoBean private PortletInstanceLayoutStorage portletInstanceLayoutStorage; - @MockBean + @MockitoBean private PortletInstanceStorage portletInstanceStorage; - @MockBean + @MockitoBean private PortletService portletService; - @MockBean + @MockitoBean private ListenerService listenerService; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/service/SectionTemplateServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/SectionTemplateServiceTest.java index 88c95798b..0e7b598a9 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/SectionTemplateServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/SectionTemplateServiceTest.java @@ -45,7 +45,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.portal.mop.navigation.NodeData; @@ -75,31 +75,31 @@ public class SectionTemplateServiceTest { private static final String CONTENT = "{}"; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private LocaleConfigService localeConfigService; - @MockBean + @MockitoBean private SectionTemplateLayoutStorage sectionTemplateLayoutStorage; - @MockBean + @MockitoBean private ContainerLayoutService containerLayoutService; - @MockBean + @MockitoBean private SectionTemplateStorage sectionTemplateStorage; - @MockBean + @MockitoBean private PortletService portletService; - @MockBean + @MockitoBean private ListenerService listenerService; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/service/SiteLayoutServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/SiteLayoutServiceTest.java index 79a0300b8..40a82552c 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/SiteLayoutServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/SiteLayoutServiceTest.java @@ -41,7 +41,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.ObjectAlreadyExistsException; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -74,22 +74,22 @@ public class SiteLayoutServiceTest { private static final SiteKey SITE_KEY = SiteKey.portal("test"); - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean private UserPortalConfigService portalConfigService; - @MockBean + @MockitoBean private LayoutAclService aclService; - @MockBean + @MockitoBean private LocaleConfigService localeConfigService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/SiteTemplateServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/SiteTemplateServiceTest.java index 4ebc90972..e6c7b6a4f 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/SiteTemplateServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/SiteTemplateServiceTest.java @@ -41,7 +41,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.ObjectAlreadyExistsException; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -72,25 +72,25 @@ public class SiteTemplateServiceTest { private static final String DESCRIPTION = "This is a sample site template."; - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean private UserPortalConfigService portalConfigService; - @MockBean + @MockitoBean private LayoutAclService aclService; - @MockBean + @MockitoBean private TranslationService translationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private ListenerService listenerService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/injection/PageTemplateImportServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/injection/PageTemplateImportServiceTest.java index b8cd97515..e348702b6 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/injection/PageTemplateImportServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/injection/PageTemplateImportServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.api.settings.SettingService; import org.exoplatform.container.configuration.ConfigurationManager; @@ -39,25 +39,25 @@ @ExtendWith(MockitoExtension.class) public class PageTemplateImportServiceTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private LayoutTranslationImportService layoutTranslationImportService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private PageTemplateService pageTemplateService; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private ResourceBundleService resourceBundleService; - @MockBean + @MockitoBean private ConfigurationManager configurationManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/injection/PortletInstanceImportServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/injection/PortletInstanceImportServiceTest.java index 1bcdba182..fe2224e29 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/injection/PortletInstanceImportServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/injection/PortletInstanceImportServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.api.settings.SettingService; import org.exoplatform.container.configuration.ConfigurationManager; @@ -39,25 +39,25 @@ @ExtendWith(MockitoExtension.class) public class PortletInstanceImportServiceTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private LayoutTranslationImportService layoutTranslationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private PortletInstanceService portletInstanceService; - @MockBean + @MockitoBean private PortletService portletService; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private ConfigurationManager configurationManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/injection/SectionTemplateImportServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/injection/SectionTemplateImportServiceTest.java index f34ef8f16..b5d94c19c 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/injection/SectionTemplateImportServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/injection/SectionTemplateImportServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.api.settings.SettingService; import org.exoplatform.container.configuration.ConfigurationManager; @@ -39,25 +39,25 @@ @ExtendWith(MockitoExtension.class) public class SectionTemplateImportServiceTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private LayoutTranslationImportService layoutTranslationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private SectionTemplateService sectionTemplateService; - @MockBean + @MockitoBean private PortletService portletService; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private ConfigurationManager configurationManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/service/injection/SiteTemplateImportServiceTest.java b/layout-service/src/test/java/io/meeds/layout/service/injection/SiteTemplateImportServiceTest.java index d179b9760..eae42a622 100644 --- a/layout-service/src/test/java/io/meeds/layout/service/injection/SiteTemplateImportServiceTest.java +++ b/layout-service/src/test/java/io/meeds/layout/service/injection/SiteTemplateImportServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.api.settings.SettingService; import org.exoplatform.container.configuration.ConfigurationManager; @@ -39,25 +39,25 @@ @ExtendWith(MockitoExtension.class) public class SiteTemplateImportServiceTest { - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private LayoutTranslationImportService layoutTranslationService; - @MockBean + @MockitoBean private AttachmentService attachmentService; - @MockBean + @MockitoBean private SiteTemplateService siteTemplateService; - @MockBean + @MockitoBean private PortletService portletService; - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private ConfigurationManager configurationManager; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/storage/PageTemplateStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/PageTemplateStorageTest.java index 3a1603ce1..e39c53ff8 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/PageTemplateStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/PageTemplateStorageTest.java @@ -36,7 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -52,7 +52,7 @@ public class PageTemplateStorageTest { private static final String LAYOUT_CONTENT = "...layout..."; - @MockBean + @MockitoBean private PageTemplateDAO pageTemplateDAO; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceCategoryStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceCategoryStorageTest.java index 50aa46d1e..b3c99a228 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceCategoryStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceCategoryStorageTest.java @@ -36,7 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -52,7 +52,7 @@ public class PortletInstanceCategoryStorageTest { private static final String ICON = "icon"; - @MockBean + @MockitoBean private PortletInstanceCategoryDAO portletInstanceCategoryDAO; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceStorageTest.java index 097ae962e..f6fc1ed71 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/PortletInstanceStorageTest.java @@ -36,7 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -52,10 +52,10 @@ public class PortletInstanceStorageTest { private static final String CONTENT_ID = "test/portlet"; - @MockBean + @MockitoBean private PortletInstanceDAO portletInstanceDAO; - @MockBean + @MockitoBean private PortletStorage portletStorage; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/storage/PortletStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/PortletStorageTest.java index 5e03f2a96..5f55af9b4 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/PortletStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/PortletStorageTest.java @@ -41,7 +41,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import io.meeds.layout.model.PortletDescriptor; @@ -59,7 +59,7 @@ public class PortletStorageTest { private static final String PORTLET_NAME = "portlet"; - @MockBean + @MockitoBean private PortletInvoker portletInvoker; @Mock diff --git a/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateLayoutStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateLayoutStorageTest.java index e2048b35f..2db2057da 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateLayoutStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateLayoutStorageTest.java @@ -34,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.ModelObject; @@ -56,19 +56,19 @@ @ExtendWith(MockitoExtension.class) public class SectionTemplateLayoutStorageTest { - @MockBean + @MockitoBean private LayoutService layoutService; - @MockBean + @MockitoBean private NavigationService navigationService; - @MockBean + @MockitoBean private PageLayoutService pageLayoutService; - @MockBean + @MockitoBean private ContainerLayoutService containerLayoutService; - @MockBean + @MockitoBean private NavigationLayoutService navigationLayoutService; @Autowired diff --git a/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateStorageTest.java b/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateStorageTest.java index b8cc2da6a..c817cf2fe 100644 --- a/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateStorageTest.java +++ b/layout-service/src/test/java/io/meeds/layout/storage/SectionTemplateStorageTest.java @@ -36,7 +36,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -52,10 +52,10 @@ public class SectionTemplateStorageTest { private static final String CONTENT = "{}"; - @MockBean + @MockitoBean private SectionTemplateDAO sectionTemplateDAO; - @MockBean + @MockitoBean private PortletStorage portletStorage; @Mock diff --git a/layout-webapp/pom.xml b/layout-webapp/pom.xml index 9cc799c37..ff9f46a30 100644 --- a/layout-webapp/pom.xml +++ b/layout-webapp/pom.xml @@ -27,7 +27,7 @@ io.meeds.layout layout - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT layout-webapp war diff --git a/pom.xml b/pom.xml index 5221dcfe4..5abb8cf3e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.meeds.layout layout - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT pom Meeds - Layout Addon - Parent POM @@ -41,7 +41,7 @@ - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT meeds-io