Skip to content

Commit 24cff2b

Browse files
committed
feat: spring update
1 parent 2880a51 commit 24cff2b

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

backend/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
*/
1313
plugins {
1414
id 'java'
15-
id 'org.springframework.boot' version '3.3.0'
16-
id 'org.graalvm.buildtools.native' version '0.10.2'
17-
id 'io.spring.dependency-management' version '1.1.4'
18-
id 'org.hibernate.orm' version '6.3.1.Final'
15+
id 'org.springframework.boot' version '3.4.0'
16+
id 'org.graalvm.buildtools.native' version '0.10.3'
17+
id 'io.spring.dependency-management' version '1.1.6'
18+
id 'org.hibernate.orm' version '6.6.3.Final'
1919
}
2020

2121
group = 'ch.xxx'
@@ -49,7 +49,7 @@ dependencies {
4949
testImplementation 'org.springframework.boot:spring-boot-starter-test'
5050
testImplementation 'org.springframework.security:spring-security-test'
5151
testImplementation 'org.springframework.graphql:spring-graphql-test'
52-
testImplementation group: 'com.tngtech.archunit', name: 'archunit-junit5', version: '1.2.0'
52+
testImplementation group: 'com.tngtech.archunit', name: 'archunit-junit5', version: '1.3.0'
5353

5454
if(project.hasProperty('withAngular')) {
5555
implementation 'org.postgresql:postgresql'

backend/src/test/java/ch/xxx/maps/adapter/controller/BaseControllerTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
*/
1313
package ch.xxx.maps.adapter.controller;
1414

15-
import org.springframework.boot.test.mock.mockito.MockBean;
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
1616

1717
import ch.xxx.maps.adapter.repository.JpaCompanySiteRepository;
1818
import ch.xxx.maps.adapter.repository.JpaLocationRepository;
1919
import ch.xxx.maps.adapter.repository.JpaPolygonRepository;
2020
import ch.xxx.maps.adapter.repository.JpaRingRepository;
2121

2222
public class BaseControllerTest {
23-
@MockBean
23+
@MockitoBean
2424
protected JpaCompanySiteRepository jpaCompanySiteRepository;
25-
@MockBean
25+
@MockitoBean
2626
protected JpaLocationRepository jpaLocationRepository;
27-
@MockBean
27+
@MockitoBean
2828
protected JpaPolygonRepository jpaPolygonRepository;
29-
@MockBean
29+
@MockitoBean
3030
protected JpaRingRepository jpaRingRepository;
3131
}

backend/src/test/java/ch/xxx/maps/adapter/controller/CompanySiteControllerTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
import java.util.Set;
2222

2323
import org.junit.jupiter.api.BeforeEach;
24-
import org.junit.jupiter.api.Test;
2524
import org.mockito.Mockito;
2625
import org.springframework.beans.factory.annotation.Autowired;
2726
import org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureGraphQlTester;
2827
import org.springframework.boot.test.context.SpringBootTest;
29-
import org.springframework.boot.test.mock.mockito.MockBean;
3028
import org.springframework.context.annotation.ComponentScan;
3129
import org.springframework.graphql.test.tester.GraphQlTester;
30+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3231

3332
import ch.xxx.maps.domain.model.dto.CompanySiteDto;
3433
import ch.xxx.maps.domain.model.entity.CompanySite;
@@ -44,9 +43,9 @@
4443
//,excludeFilters = @Filter(type = FilterType.REGEX, pattern = ".*\\.(adapter|usecase)\\.(repository|service).*")
4544
)
4645
public class CompanySiteControllerTest extends BaseControllerTest {
47-
@MockBean
46+
@MockitoBean
4847
private CompanySiteService companySiteService;
49-
@MockBean
48+
@MockitoBean
5049
private EntityDtoMapper entityDtoMapper;
5150
@Autowired
5251
private GraphQlTester graphQlTester;

0 commit comments

Comments
 (0)