Cleanup test configuration using import annotation

TAMULib · Feb 27, 2024 · b8716b4 · b8716b4
1 parent a5cde52
commit b8716b4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 126 deletions.
diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/model/repo/UserRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/model/repo/UserRepoTest.java
@@ -10,33 +10,18 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
 import edu.tamu.scholars.middleware.auth.UserIntegrationTest;
 import edu.tamu.scholars.middleware.auth.model.Role;
 import edu.tamu.scholars.middleware.auth.model.User;
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 
 @DataJpaTest
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class UserRepoTest extends UserIntegrationTest {
 
-    @TestConfiguration
-    static class UserRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Test
     public void testCreate() {
         assertEquals(0, userRepo.count());

diff --git a/src/test/java/edu/tamu/scholars/middleware/auth/service/RegistrationServiceTest.java b/src/test/java/edu/tamu/scholars/middleware/auth/service/RegistrationServiceTest.java
@@ -22,13 +22,13 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.security.core.token.Token;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -41,21 +41,18 @@
 import edu.tamu.scholars.middleware.auth.controller.request.Registration;
 import edu.tamu.scholars.middleware.auth.model.Role;
 import edu.tamu.scholars.middleware.auth.model.User;
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.service.EmailService;
 import edu.tamu.scholars.middleware.service.TemplateService;
 
 @DataJpaTest
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class RegistrationServiceTest extends RegistrationIntegrationTest {
 
     @TestConfiguration
     static class RegistrationServiceTestContextConfiguration {
 
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
         @Bean
         public AuthConfig authConfig() {
             return new AuthConfig();
@@ -81,11 +78,6 @@ public MessageSource messageSource() {
             return new ResourceBundleMessageSource();
         }
 
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
         @Bean
         public ObjectMapper objectMapper() {
             return new ObjectMapper();

diff --git a/src/test/java/edu/tamu/scholars/middleware/theme/model/repo/ThemeRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/theme/model/repo/ThemeRepoTest.java
@@ -7,32 +7,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.theme.ThemeIntegrationTest;
 import edu.tamu.scholars.middleware.theme.model.Theme;
 
 @DataJpaTest
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class ThemeRepoTest extends ThemeIntegrationTest {
 
-    @TestConfiguration
-    static class ThemeRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Test
     public void testCreate() {
         assertEquals(0, themeRepo.count());

diff --git a/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DataAndAnalyticsViewRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DataAndAnalyticsViewRepoTest.java
@@ -2,30 +2,15 @@
 
 import static edu.tamu.scholars.middleware.view.ViewTestUtility.getMockDataAndAnalyticsView;
 
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.view.model.DataAndAnalyticsView;
 
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class DataAndAnalyticsViewRepoTest extends ViewRepoTest<DataAndAnalyticsView, DataAndAnalyticsViewRepo> {
 
-    @TestConfiguration
-    static class DataAndAnalyticsViewRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Override
     protected DataAndAnalyticsView getMockView() {
         return getMockDataAndAnalyticsView();

diff --git a/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DirectoryViewRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DirectoryViewRepoTest.java
@@ -2,30 +2,15 @@
 
 import static edu.tamu.scholars.middleware.view.ViewTestUtility.getMockDirectoryView;
 
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.view.model.DirectoryView;
 
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class DirectoryViewRepoTest extends ViewRepoTest<DirectoryView, DirectoryViewRepo> {
 
-    @TestConfiguration
-    static class DirectoryViewRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Override
     protected DirectoryView getMockView() {
         return getMockDirectoryView();

diff --git a/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DiscoveryViewRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DiscoveryViewRepoTest.java
@@ -2,30 +2,15 @@
 
 import static edu.tamu.scholars.middleware.view.ViewTestUtility.getMockDiscoveryView;
 
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.view.model.DiscoveryView;
 
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class DiscoveryViewRepoTest extends ViewRepoTest<DiscoveryView, DiscoveryViewRepo> {
 
-    @TestConfiguration
-    static class DiscoveryViewRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Override
     protected DiscoveryView getMockView() {
         return getMockDiscoveryView();

diff --git a/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DisplayViewRepoTest.java b/src/test/java/edu/tamu/scholars/middleware/view/model/repo/DisplayViewRepoTest.java
@@ -8,30 +8,15 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.context.annotation.Import;
 
-import edu.tamu.scholars.middleware.config.model.MiddlewareConfig;
+import edu.tamu.scholars.middleware.config.BCryptPasswordEncoderTestConfig;
+import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
 import edu.tamu.scholars.middleware.view.model.DisplayView;
 
+@Import(value = { BCryptPasswordEncoderTestConfig.class, MiddlewareTestConfig.class })
 public class DisplayViewRepoTest extends ViewRepoTest<DisplayView, DisplayViewRepo> {
 
-    @TestConfiguration
-    static class DisplayViewRepoTestContextConfiguration {
-
-        @Bean
-        public MiddlewareConfig middlewareConfig() {
-            return new MiddlewareConfig();
-        }
-
-        @Bean
-        public BCryptPasswordEncoder bCryptPasswordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-
-    }
-
     @Test
     public void testRead() {
         testCreate();