Merge branch 'nightlyBuild' of gitlab.iaik.tugraz.at:egiz/eaaf_components into nightlyBuild

1 files changed, 12 insertions, 51 deletions

diff --git a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/impl/utils/test/AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest.java b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/impl/utils/test/AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest.java
index 34f4a3b1..8b437dcf 100644
--- a/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/impl/utils/test/AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest.java
+++ b/eaaf_core_utils/src/test/java/at/gv/egiz/eaaf/core/impl/utils/test/AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest.java
@@ -71,10 +71,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, PendingReqId is 'null' or empty]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.00", e.getErrorId());
       
     }    
   }
@@ -88,10 +85,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, PendingReqId is 'null' or empty]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.00", e.getErrorId());
       
     }    
   }
@@ -105,11 +99,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId is NOT a valid String]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.05", e.getErrorId());
       
     }    
   }
@@ -124,11 +114,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "pendingReqId exceeds max.size: 1024]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.03", e.getErrorId());
       
     }    
   }
@@ -150,11 +136,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId has an unvalid format]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.01", e.getErrorId());
       
     }    
   }
@@ -177,11 +159,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId has an unvalid format]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.01", e.getErrorId());
       
     }    
   }
@@ -204,11 +182,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId is NOT a valid String]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.05", e.getErrorId());
       
     }    
   }
@@ -231,8 +205,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNotNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());      
-      Assert.assertTrue("Wrong errorMsg", e.getMessage().contains("PendingRequestId exceeds the valid period")); 
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.06", e.getErrorId());       
       
     }    
   }
@@ -254,11 +227,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId has an unvalid format]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.01", e.getErrorId());
       
     }    
   }
@@ -281,12 +250,8 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId has an unvalid format]", 
-          e.getMessage());
-      
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.01", e.getErrorId());
+
     }    
   }
   
@@ -399,11 +364,7 @@ public class AuthenticatedEncryptionPendingRequestIdGenerationStrategyTest {
     } catch (PendingReqIdValidationException e) {
       Assert.assertNull("internal pendingReqId", e.getInvalidInternalPendingReqId());
       Assert.assertNull("internal pendingReq", e.getInvalidPendingReq());
-      Assert.assertEquals("Wrong errorId", "process.99", e.getErrorId());
-      Assert.assertEquals("Wrong errorMsg", 
-          "No StatusMessager-Backend available! StatusCode:process.99 Params:[null, "
-          + "PendingReqId is NOT a valid encrypted]", 
-          e.getMessage());
+      Assert.assertEquals("Wrong errorId", "internal.pendingreqid.04", e.getErrorId());
       
     }    
   }