Merge branch 'main' into inventory-upgrade

rajadilipkolli · Nov 18, 2024 · 9d10d66 · 9d10d66
2 parents fc94d07 + dd6378f
commit 9d10d66
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java b/inventory-service/src/test/java/com/example/inventoryservice/TestInventoryApplication.java
@@ -6,9 +6,9 @@ Licensed under MIT License Copyright (c) 2023-2024 Raja Kolli.
 
 package com.example.inventoryservice;
 
-import com.example.inventoryservice.config.NonSQLContainersConfig;
-import com.example.inventoryservice.config.SQLContainersConfig;
 import com.example.inventoryservice.utils.AppConstants;
+import com.example.inventoryservice.common.SQLContainersConfig;
+import com.example.inventoryservice.config.NonSQLContainersConfig;
 import org.springframework.boot.SpringApplication;
 
 public class TestInventoryApplication {

diff --git a/...ry-service/src/test/java/com/example/inventoryservice/common/AbstractIntegrationTest.java b/...ry-service/src/test/java/com/example/inventoryservice/common/AbstractIntegrationTest.java
@@ -9,9 +9,7 @@ Licensed under MIT License Copyright (c) 2021-2024 Raja Kolli.
 import static com.example.inventoryservice.utils.AppConstants.PROFILE_TEST;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-import com.example.inventoryservice.TestInventoryApplication;
 import com.example.inventoryservice.config.NonSQLContainersConfig;
-import com.example.inventoryservice.config.SQLContainersConfig;
 import com.example.inventoryservice.config.TestStockOrderListenerConfig;
 import com.example.inventoryservice.repositories.InventoryRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,10 +24,9 @@ Licensed under MIT License Copyright (c) 2021-2024 Raja Kolli.
 @SpringBootTest(
         webEnvironment = RANDOM_PORT,
         classes = {
-            TestInventoryApplication.class,
-            TestStockOrderListenerConfig.class,
+            SQLContainersConfig.class,
             NonSQLContainersConfig.class,
-            SQLContainersConfig.class
+            TestStockOrderListenerConfig.class
         })
 @AutoConfigureMockMvc
 public abstract class AbstractIntegrationTest {

diff --git a/inventory-service/src/test/java/com/example/inventoryservice/common/SQLContainersConfig.java b/inventory-service/src/test/java/com/example/inventoryservice/common/SQLContainersConfig.java
@@ -0,0 +1,24 @@
+/***
+<p>
+    Licensed under MIT License Copyright (c) 2023 Raja Kolli.
+</p>
+***/
+
+package com.example.inventoryservice.common;
+
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+@TestConfiguration(proxyBeanMethods = false)
+public class SQLContainersConfig {
+
+    @Bean
+    @ServiceConnection
+    PostgreSQLContainer<?> postgreSQLContainer() {
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17-alpine"))
+                .withReuse(true);
+    }
+}
diff --git a/...vice/src/test/java/com/example/inventoryservice/repositories/InventoryRepositoryTest.java b/...vice/src/test/java/com/example/inventoryservice/repositories/InventoryRepositoryTest.java
@@ -8,7 +8,7 @@ Licensed under MIT License Copyright (c) 2023 Raja Kolli.
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.example.inventoryservice.config.SQLContainersConfig;
+import com.example.inventoryservice.common.SQLContainersConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;

diff --git a/.../src/test/java/com/example/inventoryservice/repositories/JOOQInventoryRepositoryTest.java b/.../src/test/java/com/example/inventoryservice/repositories/JOOQInventoryRepositoryTest.java
@@ -9,7 +9,7 @@ Licensed under MIT License Copyright (c) 2023 Raja Kolli.
 import static com.example.inventoryservice.jooq.tables.Inventory.INVENTORY;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.example.inventoryservice.config.SQLContainersConfig;
+import com.example.inventoryservice.common.SQLContainersConfig;
 import com.example.inventoryservice.entities.Inventory;
 import java.util.List;
 import org.jooq.DSLContext;