diff --git a/wallet-api/pom.xml b/wallet-api/pom.xml index 70fc4d54d8..fa27e7ae39 100644 --- a/wallet-api/pom.xml +++ b/wallet-api/pom.xml @@ -39,6 +39,28 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. provided + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + com.vaadin.external.google + android-json + + + + + org.springframework.security + spring-security-test + test + + + com.vaadin.external.google + android-json + + + org.springframework.boot spring-boot-starter-test diff --git a/wallet-reward-services/pom.xml b/wallet-reward-services/pom.xml index 6fee91bb92..947a35c649 100644 --- a/wallet-reward-services/pom.xml +++ b/wallet-reward-services/pom.xml @@ -60,6 +60,28 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + com.vaadin.external.google + android-json + + + + + org.springframework.security + spring-security-test + test + + + com.vaadin.external.google + android-json + + + org.springframework.boot spring-boot-starter-test diff --git a/wallet-reward-services/src/main/resources/jpa-entities.idx b/wallet-reward-services/src/main/resources/jpa-entities.idx index 727698e883..01b6bae4b4 100644 --- a/wallet-reward-services/src/main/resources/jpa-entities.idx +++ b/wallet-reward-services/src/main/resources/jpa-entities.idx @@ -1,2 +1,3 @@ +io.meeds.wallet.reward.entity.WalletRewardEntity io.meeds.wallet.reward.entity.WalletRewardPeriodEntity -io.meeds.wallet.reward.entity.WalletRewardEntity \ No newline at end of file +io.meeds.wallet.reward.entity.WalletRewardPeriodSummaryEntity \ No newline at end of file diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardReportUpdateListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardReportUpdateListenerTest.java index d5c0c5ff02..5805aeae03 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardReportUpdateListenerTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardReportUpdateListenerTest.java @@ -33,7 +33,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.exoplatform.services.listener.Event; import org.exoplatform.services.listener.ListenerService; @@ -44,19 +44,19 @@ @SpringBootTest(classes = { RewardReportUpdateListener.class, }) class RewardReportUpdateListenerTest { - @MockBean + @MockitoBean private WalletRewardReportService rewardReportService; - @MockBean + @MockitoBean private RewardSettingsService rewardSettingsService; - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private RealizationService realizationService; - @MockBean + @MockitoBean private Event> event; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java index 3dbcc0b454..ae89040d94 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedAnalyticsListenerTest.java @@ -27,7 +27,7 @@ import org.mockito.Mockito; 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.Event; import org.exoplatform.services.listener.ListenerService; @@ -45,10 +45,10 @@ @SpringBootTest(classes = { RewardSucceedAnalyticsListener.class, }) class RewardSucceedAnalyticsListenerTest { - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private Event event; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java index 55211c3f2c..7bf32ac08d 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/RewardSucceedNotificationListenerTest.java @@ -30,7 +30,7 @@ import org.mockito.Mockito; 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.notification.NotificationContext; import org.exoplatform.commons.api.notification.model.PluginKey; @@ -45,16 +45,16 @@ class RewardSucceedNotificationListenerTest { private static final String EVENT_NAME = "exo.wallet.reward.report.success"; - @MockBean + @MockitoBean private Event event; - @MockBean + @MockitoBean private RewardReport rewardReport; - @MockBean + @MockitoBean private NotificationContext notificationContext; - @MockBean + @MockitoBean private ListenerService listenerService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java index 930c0f1af2..73fd840ce0 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/listener/TransactionReplacedListenerTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; 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.Event; import org.exoplatform.services.listener.ListenerService; @@ -39,13 +39,13 @@ class TransactionReplacedListenerTest { private static final String EVENT_NAME = "exo.wallet.transaction.replaced"; - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private RewardReportService rewardReportService; - @MockBean + @MockitoBean private Event> event; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java index a80ce56725..0da34695e1 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardReportREST.java @@ -40,10 +40,10 @@ import org.mockito.Mockito; 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.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.http.MediaType; @@ -97,10 +97,10 @@ class TestRewardReportREST { OBJECT_MAPPER.registerModule(new JavaTimeModule()); } - @MockBean + @MockitoBean private RewardReportService rewardReportService; - @MockBean + @MockitoBean private RewardSettingsService rewardSettingsService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java index 7588e700cd..098cafa311 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/rest/TestRewardSettingsREST.java @@ -34,10 +34,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; @@ -91,7 +91,7 @@ class TestRewardSettingsREST { OBJECT_MAPPER.registerModule(new JavaTimeModule()); } - @MockBean + @MockitoBean private RewardSettingsService rewardSettingsService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardReportUpdateTaskTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardReportUpdateTaskTest.java index 8e7d8fe350..6f8e943bc4 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardReportUpdateTaskTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardReportUpdateTaskTest.java @@ -26,13 +26,13 @@ import org.junit.jupiter.api.Test; 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.mockito.Mockito.*; @SpringBootTest(classes = { RewardReportUpdateTask.class }) class RewardReportUpdateTaskTest { - @MockBean + @MockitoBean private RewardReportService rewardReportService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java index 8e527a5155..90973593d1 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/scheduling/RewardStatusVerifierTaskTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; 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 io.meeds.wallet.utils.RewardUtils.REWARD_SUCCESS_EVENT_NAME; import static org.mockito.Mockito.*; @@ -36,13 +36,13 @@ @SpringBootTest(classes = { RewardStatusVerifierTask.class }) class RewardStatusVerifierTaskTest { - @MockBean + @MockitoBean private RewardReportService rewardReportService; - @MockBean + @MockitoBean private WalletAccountService walletAccountService; - @MockBean + @MockitoBean private ListenerService listenerService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java index 3503674f3a..7997d58af9 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardReportServiceTest.java @@ -51,7 +51,7 @@ import org.mockito.Mockito; 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.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -69,22 +69,22 @@ public class WalletRewardReportServiceTest { // NOSONAR private static final Pageable PAGEABLE = Pageable.ofSize(2); - @MockBean + @MockitoBean private WalletAccountService walletAccountService; - @MockBean + @MockitoBean private WalletTokenAdminService walletTokenAdminService; - @MockBean + @MockitoBean private RewardSettingsService rewardSettingsService; - @MockBean + @MockitoBean private WalletRewardReportStorage rewardReportStorage; - @MockBean + @MockitoBean private RealizationService realizationService; - @MockBean + @MockitoBean private ResourceBundleService resourceBundleService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java index dd982759b6..fbe60d5dbc 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/service/WalletRewardSettingsServiceTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; 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 io.meeds.wallet.utils.WalletUtils.toJsonString; import static org.junit.jupiter.api.Assertions.*; @@ -41,10 +41,10 @@ @SpringBootTest(classes = { WalletRewardSettingsService.class }) public class WalletRewardSettingsServiceTest { - @MockBean + @MockitoBean private SettingService settingService; - @MockBean + @MockitoBean private ListenerService listenerService; @Autowired diff --git a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java index 9603cbf9d4..8d75781029 100644 --- a/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.java +++ b/wallet-reward-services/src/test/java/io/meeds/wallet/reward/storage/WalletRewardReportStorageTest.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.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -64,19 +64,19 @@ class WalletRewardReportStorageTest { private static final Pageable PAGEABLE = Pageable.ofSize(2); - @MockBean + @MockitoBean private RewardDAO rewardDAO; - @MockBean + @MockitoBean private RewardPeriodDAO rewardPeriodDAO; - @MockBean + @MockitoBean private RewardPeriodSummaryDAO rewardPeriodSummaryDAO; - @MockBean + @MockitoBean private WalletAccountService walletAccountService; - @MockBean + @MockitoBean private WalletTransactionService walletTransactionService; @Autowired diff --git a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java index 842fd01af8..0c202b6800 100644 --- a/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java +++ b/wallet-webapps/src/main/java/io/meeds/wallet/WalletApplication.java @@ -19,7 +19,7 @@ package io.meeds.wallet; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.context.annotation.PropertySource; import io.meeds.spring.AvailableIntegration;