Refactor test to junit 5

xenit-eu · Dec 2, 2021 · 6329ca1 · 6329ca1
1 parent 98f370e
commit 6329ca1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/thunx-autoconfigure/build.gradle b/thunx-autoconfigure/build.gradle
@@ -4,10 +4,6 @@ plugins {
 
 apply from: "${rootDir}/gradle/publish.gradle"
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
 
     compileOnly platform("org.springframework.boot:spring-boot-dependencies:${springBootBomVersion}")
@@ -32,7 +28,7 @@ dependencies {
     testImplementation platform("org.springframework.boot:spring-boot-dependencies:${springBootBomVersion}")
     testImplementation platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")
 
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.mockito:mockito-core:2.1.0'
     testImplementation "org.springframework.boot:spring-boot-test:${springBootBomVersion}"
@@ -45,3 +41,7 @@ dependencies {
     testImplementation project(':thunx-pdp-opa')
     testImplementation "eu.xenit.contentcloud:opa-async-java-client:0.2.0"
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/...rc/test/java/eu/xenit/contentcloud/thunx/api/autoconfigure/AbacAutoConfigurationTest.java b/...rc/test/java/eu/xenit/contentcloud/thunx/api/autoconfigure/AbacAutoConfigurationTest.java
@@ -3,15 +3,11 @@
 import eu.xenit.contentcloud.thunx.encoding.ThunkExpressionDecoder;
 import eu.xenit.contentcloud.thunx.spring.data.rest.AbacExceptionHandler;
 import eu.xenit.contentcloud.thunx.spring.data.rest.AbacRequestFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.repository.support.Repositories;

diff --git a/.../java/eu/xenit/contentcloud/thunx/gateway/autoconfigure/GatewayAutoConfigurationTest.java b/.../java/eu/xenit/contentcloud/thunx/gateway/autoconfigure/GatewayAutoConfigurationTest.java
@@ -3,14 +3,13 @@
 import eu.xenit.contentcloud.opa.client.OpaClient;
 import eu.xenit.contentcloud.thunx.pdp.PolicyDecisionPointClient;
 import eu.xenit.contentcloud.thunx.spring.gateway.filter.AbacGatewayFilterFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.security.authorization.ReactiveAuthorizationManager;
 import org.springframework.security.web.server.authorization.AuthorizationContext;