Tests for revocation disabled with condition.

WorldHealthOrganization · Nov 30, 2023 · 0704303 · 0704303
1 parent 42e54c0
commit 0704303
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,6 @@
         <shedlock.version>5.2.0</shedlock.version>
         <h2.version>2.2.220</h2.version>
         <!-- plugins -->
-        <plugin.maven-surefire.version>3.1.2</plugin.maven-surefire.version>
         <plugin.maven-assembly.version>3.4.2</plugin.maven-assembly.version>
         <plugin.checkstyle.version>3.2.1</plugin.checkstyle.version>
         <plugin.sonar.version>3.9.1.2184</plugin.sonar.version>
@@ -386,17 +385,6 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>${plugin.maven-assembly.version}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${plugin.maven-surefire.version}</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>eu.europa.ec.dgc.gateway.restapi.controller/CertificateRevocationListIntegrationTest.java</exclude>
-                            <exclude>eu.europa.ec.dgc.gateway.service/CertificateRevocationListCleanupTest.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

diff --git a/...eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListIntegrationTest.java b/...eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListIntegrationTest.java
@@ -69,11 +69,13 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
 import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @AutoConfigureMockMvc
 @Slf4j
+@EnabledIf(expression = "${dgc.revocation.enabled}", loadContext = true)
 public class CertificateRevocationListIntegrationTest {
 
     @Autowired

diff --git a/src/test/java/eu/europa/ec/dgc/gateway/service/CertificateRevocationListCleanupTest.java b/src/test/java/eu/europa/ec/dgc/gateway/service/CertificateRevocationListCleanupTest.java
@@ -30,9 +30,11 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
 
 @SpringBootTest(properties = "dgc.revocation.delete-threshold=14")
 @Slf4j
+@EnabledIf(expression = "${dgc.revocation.enabled}", loadContext = true)
 class CertificateRevocationListCleanupTest {
 
     @Autowired

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -39,6 +39,8 @@ dgc:
       thumbprint: X-SSL-Client-SHA256
       distinguished-name: X-SSL-Client-DN
       pem: X-SSL-Client-Cert
+  revocation:
+    enabled: false
   did:
     enableDidGeneration: true
     didId: a