From 7d9efb1667e2e984fe660ce0d6142127d70528e4 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Tue, 26 Apr 2022 08:31:51 +0200
Subject: [PATCH] Fix failed plans
---
.../server/security/SecurityConfigurationClientCertTest.java | 5 ++---
.../cipa/smp/server/security/SecurityConfigurationTest.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationClientCertTest.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationClientCertTest.java
index 9f884c2e8..ef95f6360 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationClientCertTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationClientCertTest.java
@@ -15,6 +15,7 @@ package eu.europa.ec.cipa.smp.server.security;
import eu.europa.ec.edelivery.smp.test.SmpTestWebAppConfig;
+import eu.europa.ec.edelivery.smp.test.testutils.MockMvcUtils;
import eu.europa.ec.edelivery.smp.test.testutils.X509CertificateTestUtils;
import org.junit.Before;
import org.junit.ClassRule;
@@ -152,9 +153,7 @@ public class SecurityConfigurationClientCertTest {
@Before
public void setup() throws IOException {
X509CertificateTestUtils.reloadKeystores();
- mvc = MockMvcBuilders.webAppContextSetup(context)
- .apply(SecurityMockMvcConfigurers.springSecurity())
- .build();
+ mvc = MockMvcUtils.initializeMockMvc(context);
}
@Parameterized.Parameter()
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
index c5572f4c1..ed8bfca45 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
@@ -15,6 +15,7 @@ package eu.europa.ec.cipa.smp.server.security;
import eu.europa.ec.edelivery.exception.ClientCertParseException;
import eu.europa.ec.edelivery.smp.test.SmpTestWebAppConfig;
+import eu.europa.ec.edelivery.smp.test.testutils.MockMvcUtils;
import eu.europa.ec.edelivery.smp.test.testutils.X509CertificateTestUtils;
import org.junit.Assert;
import org.junit.Before;
@@ -71,9 +72,7 @@ public class SecurityConfigurationTest {
@Before
public void setup() throws IOException {
X509CertificateTestUtils.reloadKeystores();
- mvc = MockMvcBuilders.webAppContextSetup(context)
- .apply(SecurityMockMvcConfigurers.springSecurity())
- .build();
+ mvc = MockMvcUtils.initializeMockMvc(context);
}
--
GitLab