diff --git a/ide-packaging/pom.xml b/ide-packaging/pom.xml index 29f1a85a..953eceba 100644 --- a/ide-packaging/pom.xml +++ b/ide-packaging/pom.xml @@ -26,7 +26,7 @@ io.meeds.ide ide - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT ide-packaging pom diff --git a/ide-service/pom.xml b/ide-service/pom.xml index eccfb66a..7cb4dddd 100644 --- a/ide-service/pom.xml +++ b/ide-service/pom.xml @@ -26,7 +26,7 @@ io.meeds.ide ide - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT ide-service jar @@ -52,6 +52,17 @@ analytics-api provided + + org.springframework.security + spring-security-test + test + + + com.vaadin.external.google + android-json + + + org.springframework.boot spring-boot-starter-test @@ -63,6 +74,17 @@ + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + com.vaadin.external.google + android-json + + + ide-service diff --git a/ide-service/src/test/java/io/meeds/ide/listener/StaticResourcesAnalyticsListenerTest.java b/ide-service/src/test/java/io/meeds/ide/listener/StaticResourcesAnalyticsListenerTest.java index e6c9ef1f..b3b0ea94 100644 --- a/ide-service/src/test/java/io/meeds/ide/listener/StaticResourcesAnalyticsListenerTest.java +++ b/ide-service/src/test/java/io/meeds/ide/listener/StaticResourcesAnalyticsListenerTest.java @@ -31,7 +31,7 @@ import org.mockito.MockedStatic; 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.springframework.test.context.TestPropertySource; import org.exoplatform.services.listener.Event; @@ -47,10 +47,10 @@ @TestPropertySource(properties = { "spring.profiles.active=layout", }) class StaticResourcesAnalyticsListenerTest { - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private Event event; @Mock diff --git a/ide-service/src/test/java/io/meeds/ide/plugin/renderer/WidgetPortletInstancePreferencePluginTest.java b/ide-service/src/test/java/io/meeds/ide/plugin/renderer/WidgetPortletInstancePreferencePluginTest.java index dae01f67..cc073dfe 100644 --- a/ide-service/src/test/java/io/meeds/ide/plugin/renderer/WidgetPortletInstancePreferencePluginTest.java +++ b/ide-service/src/test/java/io/meeds/ide/plugin/renderer/WidgetPortletInstancePreferencePluginTest.java @@ -40,7 +40,7 @@ import org.exoplatform.portal.pom.spi.portlet.Preference; import io.meeds.layout.model.PortletInstancePreference; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; @SpringBootTest(classes = { WidgetPortletInstancePreferencePlugin.class, }) @ExtendWith(MockitoExtension.class) @@ -52,7 +52,7 @@ class WidgetPortletInstancePreferencePluginTest { private static final String SETTING_NAME = "name"; - @MockBean + @MockitoBean private WidgetService widgetService; @Autowired diff --git a/ide-service/src/test/java/io/meeds/ide/rest/StaticResourceRestTest.java b/ide-service/src/test/java/io/meeds/ide/rest/StaticResourceRestTest.java index 06eb4893..639f6c38 100644 --- a/ide-service/src/test/java/io/meeds/ide/rest/StaticResourceRestTest.java +++ b/ide-service/src/test/java/io/meeds/ide/rest/StaticResourceRestTest.java @@ -31,10 +31,10 @@ import org.mockito.Mock; 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; @@ -83,7 +83,7 @@ class StaticResourceRestTest { OBJECT_MAPPER.registerModule(new JavaTimeModule()); } - @MockBean + @MockitoBean private StaticResourceService staticResourceService; @Autowired diff --git a/ide-service/src/test/java/io/meeds/ide/rest/WidgetRestTest.java b/ide-service/src/test/java/io/meeds/ide/rest/WidgetRestTest.java index 55e08626..efeec2c7 100644 --- a/ide-service/src/test/java/io/meeds/ide/rest/WidgetRestTest.java +++ b/ide-service/src/test/java/io/meeds/ide/rest/WidgetRestTest.java @@ -32,10 +32,10 @@ import org.mockito.Mock; 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.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -94,7 +94,7 @@ public class WidgetRestTest { OBJECT_MAPPER.registerModule(new JavaTimeModule()); } - @MockBean + @MockitoBean private WidgetService widgetService; @Autowired diff --git a/ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.java b/ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.java index f1959b6d..e398126b 100644 --- a/ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.java +++ b/ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.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.services.listener.ListenerService; import org.exoplatform.social.core.identity.model.Identity; @@ -59,19 +59,19 @@ class StaticResourceServiceTest { private static final String SITE_NAME = "siteName"; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private IdentityManager identityManager; - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private WidgetStorage widgetStorage; - @MockBean + @MockitoBean private UserPortalConfigService userPortalConfigService; @Autowired diff --git a/ide-service/src/test/java/io/meeds/ide/service/WidgetServiceTest.java b/ide-service/src/test/java/io/meeds/ide/service/WidgetServiceTest.java index 83745866..fcf2aaaa 100644 --- a/ide-service/src/test/java/io/meeds/ide/service/WidgetServiceTest.java +++ b/ide-service/src/test/java/io/meeds/ide/service/WidgetServiceTest.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.ObjectAlreadyExistsException; import org.exoplatform.commons.exception.ObjectNotFoundException; @@ -59,16 +59,16 @@ public class WidgetServiceTest { private static final String JS_CONTENT = "...js..."; - @MockBean + @MockitoBean private LayoutAclService layoutAclService; - @MockBean + @MockitoBean private IdentityManager identityManager; - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private WidgetStorage widgetStorage; @Autowired diff --git a/ide-service/src/test/java/io/meeds/ide/storage/WidgetStorageTest.java b/ide-service/src/test/java/io/meeds/ide/storage/WidgetStorageTest.java index ce5eefc4..153b3516 100644 --- a/ide-service/src/test/java/io/meeds/ide/storage/WidgetStorageTest.java +++ b/ide-service/src/test/java/io/meeds/ide/storage/WidgetStorageTest.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 io.meeds.ide.dao.WidgetDAO; import io.meeds.ide.entity.WidgetEntity; @@ -59,7 +59,7 @@ public class WidgetStorageTest { private static final LocalDateTime MODIFIED_DATE = LocalDate.of(2024, 8, 22).atStartOfDay().minusHours(16); - @MockBean + @MockitoBean private WidgetDAO widgetDAO; @Autowired diff --git a/ide-webapp/pom.xml b/ide-webapp/pom.xml index cb63152b..5fb8c202 100644 --- a/ide-webapp/pom.xml +++ b/ide-webapp/pom.xml @@ -25,7 +25,7 @@ io.meeds.ide ide - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT ide-webapp war diff --git a/pom.xml b/pom.xml index a71cf4dd..786b85b4 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.meeds.ide ide - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT pom Meeds - IDE - Parent POM IDE addon for Meeds based Web Application @@ -47,9 +47,9 @@ HEAD - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT meeds-io