Add NESTED recipient handling to configuration

siemens · Jul 11, 2024 · 8ebd073 · 8ebd073
1 parent e8fb6b4
commit 8ebd073
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -172,7 +172,7 @@
 		<dependency>
 			<groupId>com.siemens.pki</groupId>
 			<artifactId>CmpRaComponent</artifactId>
-			<version>4.1.3</version>
+			<version>4.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>

diff --git a/src/test/java/com/siemens/pki/lightweightcmpclient/test/DelayedEnrollmentTestcaseBase.java b/src/test/java/com/siemens/pki/lightweightcmpclient/test/DelayedEnrollmentTestcaseBase.java
@@ -48,12 +48,12 @@ public void setUpDelayedEnrollmentDirs() throws Exception {
         TestUtils.deleteAllFilesIn("./target/CmpTest/Downstream", "./target/CmpTest/Upstream");
     }
 
-    @Test
+    @Test(timeout = 60000L)
     public void testCrWithPolling() throws Exception {
         enrollWithConfig("DelayedClientEnrollmentConfigWithHttpAndSignature.yaml");
     }
 
-    @Test
+    @Test(timeout = 60000L)
     public void testRrWithPolling() throws Exception {
         revokeWithConfigAndCert("DelayedClientEnrollmentConfigWithHttpAndSignature.yaml");
     }

diff --git a/src/test/java/com/siemens/pki/lightweightcmpra/test/TestRrWithPolling.java b/src/test/java/com/siemens/pki/lightweightcmpra/test/TestRrWithPolling.java
@@ -26,12 +26,10 @@
 import com.siemens.pki.lightweightcmpra.test.framework.HeaderProviderForTest;
 import org.bouncycastle.asn1.cmp.PKIBody;
 import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Ignore
 public class TestRrWithPolling extends DelayedEnrollmentTescaseBase {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TestRrWithPolling.class);
@@ -41,7 +39,7 @@ public class TestRrWithPolling extends DelayedEnrollmentTescaseBase {
      *
      * @throws Exception
      */
-    @Test
+    @Test(timeout = 60000L)
     public void testRrWithPolling() throws Exception {
         final EnrollmentResult certificateToRevoke = executeDelayedCertificateRequest(
                 PKIBody.TYPE_CERT_REQ,

diff --git a/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/TestUtils.java b/src/test/java/com/siemens/pki/lightweightcmpra/test/framework/TestUtils.java
@@ -169,9 +169,9 @@ public static void deleteAllFilesIn(String... directoryNames) {
         }
     }
 
-    private static boolean deleteDirectory(final File directoryToBeDeleted) {
+    private static void deleteDirectory(final File directoryToBeDeleted) {
         deleteAllFilesIn(directoryToBeDeleted);
-        return directoryToBeDeleted.delete();
+        assertTrue("delete " + directoryToBeDeleted, directoryToBeDeleted.delete());
     }
 
     public static String getPassword() {
@@ -184,7 +184,7 @@ public static char[] getPasswordAsCharArray() {
 
     public static void removeDirectories(String... directoryNames) {
         for (final String akt : directoryNames) {
-            assertTrue("deleting " + akt, deleteDirectory(new File(akt)));
+            deleteDirectory(new File(akt));
         }
     }