[URGENT] fix build tests

pom.xml

@@ -600,12 +600,6 @@ See the Licence for the specific language governing permissions and limitations
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>

smp-examples/resource-spi-example/pom.xml

@@ -61,11 +61,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

smp-resource-extensions/oasis-cppa3-spi/pom.xml

@@ -54,11 +54,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

smp-resource-extensions/oasis-smp-spi/pom.xml

@@ -56,11 +56,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSignerTest.java

@@ -29,6 +29,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.w3c.dom.Document;
@@ -48,13 +49,13 @@ import java.nio.file.Paths;
 
  */
 @ContextConfiguration(classes = { SmpXmlSignatureService.class})
-class ServiceMetadataSignerTest extends AbstractJunit5BaseDao{
+class ServiceMetadataSignerTest extends AbstractJunit5BaseDao {
 
     Path resourceDirectory = Paths.get("src", "test", "resources",  "keystores");
 
     ConfigurationService configurationService = Mockito.mock(ConfigurationService.class);
 
-    @Autowired
+    @SpyBean
     UIKeystoreService uiKeystoreService;
 
     @Autowired
@@ -62,7 +63,7 @@ class ServiceMetadataSignerTest extends AbstractJunit5BaseDao{
 
     @BeforeEach
     public void setup(){
-        configurationService = Mockito.spy(configurationService);
+
         ReflectionTestUtils.setField(uiKeystoreService,"configurationService",configurationService);
         ReflectionTestUtils.setField(signer,"uiKeystoreService",uiKeystoreService);
 
@@ -88,8 +89,7 @@ class ServiceMetadataSignerTest extends AbstractJunit5BaseDao{
 
     private Element loadAndSignDocumentForAdmin(String filePath) throws Exception {
         Document response = SignatureUtil.loadDocument(filePath);
-        Element adminSignature = SignatureUtil.findServiceInfoSig(response);
-        return adminSignature;
+        return SignatureUtil.findServiceInfoSig(response);
     }
 
     @ParameterizedTest

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreServiceTest.java

@@ -39,6 +39,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.security.*;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
@@ -65,8 +66,6 @@ public class UIKeystoreServiceTest extends AbstractServiceIntegrationTest {
     public void setup() throws IOException {
         // restore keystore
         resetKeystore();
-
-        configurationService = Mockito.spy(configurationService);
         ReflectionTestUtils.setField(testInstance, "configurationService", configurationService);
 
         // set keystore properties
@@ -191,9 +190,8 @@ public class UIKeystoreServiceTest extends AbstractServiceIntegrationTest {
         assertNotNull(testInstance.getKey(S_ALIAS));
         testInstance.deleteKey(S_ALIAS);
         //when
-        SMPRuntimeException result = assertThrows(SMPRuntimeException.class, () -> {
-            testInstance.getCert(S_ALIAS);
-        });
+        SMPRuntimeException result = assertThrows(SMPRuntimeException.class,
+                () -> testInstance.getCert(S_ALIAS));
 
         MatcherAssert.assertThat(result.getMessage(),
                 CoreMatchers.containsString("Wrong configuration, missing key pair from keystore or wrong alias: " + S_ALIAS));
@@ -208,9 +206,8 @@ public class UIKeystoreServiceTest extends AbstractServiceIntegrationTest {
         assertNotNull(testInstance.getKey(S_ALIAS));
         testInstance.deleteKey(S_ALIAS);
         //when
-        SMPRuntimeException result = assertThrows(SMPRuntimeException.class, () -> {
-            testInstance.getKey(S_ALIAS);
-        });
+        SMPRuntimeException result = assertThrows(SMPRuntimeException.class,
+                () -> testInstance.getKey(S_ALIAS));
 
         MatcherAssert.assertThat(result.getMessage(),
                 CoreMatchers.containsString("Wrong configuration, missing key pair from keystore or wrong alias: " + S_ALIAS));
@@ -220,8 +217,8 @@ public class UIKeystoreServiceTest extends AbstractServiceIntegrationTest {
         // Load the KeyStore and get the signing key and certificate.
         File keystoreFilePath = new File(resourceDirectory.toFile(), keystoreName);
 
-        KeyStore keyStore = null;
-        try (InputStream keystoreInputStream = new FileInputStream(keystoreFilePath)) {
+        KeyStore keyStore;
+        try (InputStream keystoreInputStream = Files.newInputStream(keystoreFilePath.toPath())) {
             keyStore = KeyStore.getInstance(type);
             keyStore.load(keystoreInputStream, password.toCharArray());
         }