diff --git a/src/test/java/org/daming/hoteler/security/service/impl/Base64PasswordServiceTest.java b/src/test/java/org/daming/hoteler/security/service/impl/Base64PasswordServiceTest.java index 1f7593fa..73662729 100644 --- a/src/test/java/org/daming/hoteler/security/service/impl/Base64PasswordServiceTest.java +++ b/src/test/java/org/daming/hoteler/security/service/impl/Base64PasswordServiceTest.java @@ -1,17 +1,34 @@ package org.daming.hoteler.security.service.impl; +import org.daming.hoteler.config.prop.SecretProp; +import org.daming.hoteler.config.service.ISecretPropService; +import org.daming.hoteler.config.service.impl.SecretPropServiceImpl; +import org.daming.hoteler.service.IErrorService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; 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.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.ContextConfiguration; import static org.junit.jupiter.api.Assertions.*; @SpringBootTest -//@SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true") +@ContextConfiguration(classes = Base64PasswordServiceTest.TestConfig.class) class Base64PasswordServiceTest { + @Configuration + static class TestConfig { + + @Bean + public Base64PasswordService md5PasswordService() { + return new Base64PasswordService(); + } + } + @Autowired private Base64PasswordService base64PasswordService; diff --git a/src/test/java/org/daming/hoteler/security/service/impl/DESPasswordServiceTest.java b/src/test/java/org/daming/hoteler/security/service/impl/DESPasswordServiceTest.java index cc78e96b..e6bd531a 100644 --- a/src/test/java/org/daming/hoteler/security/service/impl/DESPasswordServiceTest.java +++ b/src/test/java/org/daming/hoteler/security/service/impl/DESPasswordServiceTest.java @@ -45,7 +45,6 @@ public ISecretPropService secretPropService(SecretProp secretProp) { @Bean public DESPasswordService md5PasswordService(IErrorService errorService, ISecretPropService secretPropService) { - return new DESPasswordService(errorService, secretPropService); } }