9/11: testing

guma2k2 · Nov 9, 2023 · da9fcea · da9fcea
1 parent f6f3a05
commit da9fcea
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,6 +20,9 @@
 		<io.jsonwebtoken.jjwt.version>0.9.1</io.jsonwebtoken.jjwt.version>
 		<io.jsonwebtoken.jjwt-jackson.version>0.11.5</io.jsonwebtoken.jjwt-jackson.version>
 		<software.amazon.awssdk.s3.version>2.20.68</software.amazon.awssdk.s3.version>
+		<docker.username>thuanvn2002</docker.username>
+		<docker.image.name>spotifyapi</docker.image.name>
+		<docker.image.tag>${project.artifactId}</docker.image.tag>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -168,7 +171,34 @@
 					</excludes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.google.cloud.tools</groupId>
+				<artifactId>jib-maven-plugin</artifactId>
+				<version>3.3.2</version>
+				<configuration>
+					<from>
+						<image>eclipse-temurin:17</image>
+						<platforms>
+							<platform>
+								<architecture>arm64</architecture>
+								<os>linux</os>
+							</platform>
+							<platform>
+								<architecture>amd64</architecture>
+								<os>linux</os>
+							</platform>
+						</platforms>
+					</from>
+					<to>
+						<image>docker.io/${docker.username}/${docker.image.name}:${docker.image.tag}</image>
+						<tags>
+							<tag>latest</tag>
+						</tags>
+					</to>
+				</configuration>
+			</plugin>
 		</plugins>
+
 	</build>
 
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -6,7 +6,7 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQLDialect
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql= true
-
+spring.datasource.max-lifetime=1800000
 application.security.jwt.secret-key = 404E635266556A586E3272357538782F413F4428472B4B6250645367566B5970
 application.security.jwt.expiration = 600000
 application.security.jwt.refresh-token.expiration =  14400000

diff --git a/src/test/java/com/spotify/app/AbstractTestcontainers.java b/src/test/java/com/spotify/app/AbstractTestcontainers.java
@@ -36,7 +36,6 @@ static void beforeAll() {
                     .withDatabaseName("spotify-dao-unit-test")
                     .withUsername("kai")
                     .withPassword("password")
-                    .withReuse(true)
             ;
 
     @DynamicPropertySource

diff --git a/src/test/java/com/spotify/app/journey/AuthenticationIT.java b/src/test/java/com/spotify/app/journey/AuthenticationIT.java
@@ -24,7 +24,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Slf4j
-public class AuthenticationIT extends AbstractTestcontainers {
+public class AuthenticationIT  {
 
     @Autowired
     private  TestRestTemplate restTemplate;

diff --git a/src/test/java/com/spotify/app/journey/UserIT.java b/src/test/java/com/spotify/app/journey/UserIT.java
@@ -17,7 +17,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Slf4j
-public class UserIT extends AbstractTestcontainers {
+public class UserIT  {
 
     @Autowired
     private TestRestTemplate restTemplate;

diff --git a/src/test/java/com/spotify/app/user/UserRepositoryTest.java b/src/test/java/com/spotify/app/user/UserRepositoryTest.java
@@ -8,6 +8,7 @@
 import com.spotify.app.model.User;
 import com.spotify.app.repository.RoleRepository;
 import com.spotify.app.repository.UserRepository;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,7 @@
 @DataJpaTest
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
 @Import({TestConfig.class})
-public class UserRepositoryTest extends AbstractTestcontainers {
+public class UserRepositoryTest  {
 
     @Autowired
     private UserRepository underTest ;