Commit 11a1186b authored by Cypres TAC's avatar Cypres TAC
Browse files

correction on decrypt call in test (solve conflict)

parent 5b31cf31
Pipeline #227590 passed with stage
in 1 minute and 46 seconds
...@@ -223,7 +223,7 @@ class LocationSpecificPartTest { ...@@ -223,7 +223,7 @@ class LocationSpecificPartTest {
String serverAuthoritySecretKey, String serverAuthorityPublicKey, String lspbase64) throws CleaEncryptionException { String serverAuthoritySecretKey, String serverAuthorityPublicKey, String lspbase64) throws CleaEncryptionException {
LocationSpecificPartDecoder decoder = new LocationSpecificPartDecoder(serverAuthoritySecretKey); LocationSpecificPartDecoder decoder = new LocationSpecificPartDecoder(serverAuthoritySecretKey);
LocationSpecificPart lsp = decoder.decrypt(lspbase64); LocationSpecificPart lsp = decoder.decrypt(lspbase64).decodeMessage();
assertThat(lsp.isStaff()).isEqualTo(staff==1); assertThat(lsp.isStaff()).isEqualTo(staff==1);
assertThat(lsp.getCountryCode()).isEqualTo(countryCode); assertThat(lsp.getCountryCode()).isEqualTo(countryCode);
...@@ -296,7 +296,7 @@ class LocationSpecificPartTest { ...@@ -296,7 +296,7 @@ class LocationSpecificPartTest {
/* Encode a LSP with location */ /* Encode a LSP with location */
String encryptedLocationSpecificPart = location.getLocationSpecificPartEncryptedBase64(); String encryptedLocationSpecificPart = location.getLocationSpecificPartEncryptedBase64();
/* Decode the encoded LSP */ /* Decode the encoded LSP */
LocationSpecificPart decodedLsp = new LocationSpecificPartDecoder(serverAuthoritySecretKey).decrypt(encryptedLocationSpecificPart); LocationSpecificPart decodedLsp = new LocationSpecificPartDecoder(serverAuthoritySecretKey).decrypt(encryptedLocationSpecificPart).decodeMessage();
assertThat(decodedLsp).isEqualTo(lsp); assertThat(decodedLsp).isEqualTo(lsp);
...@@ -315,7 +315,8 @@ class LocationSpecificPartTest { ...@@ -315,7 +315,8 @@ class LocationSpecificPartTest {
String lspbase64) throws CleaEncryptionException { String lspbase64) throws CleaEncryptionException {
/* Decode the encoded LSP */ /* Decode the encoded LSP */
LocationSpecificPartDecoder decoder = new LocationSpecificPartDecoder(serverAuthoritySecretKey); LocationSpecificPartDecoder decoder = new LocationSpecificPartDecoder(serverAuthoritySecretKey);
LocationSpecificPart lsp = decoder.decrypt(lspbase64); LocationSpecificPart lsp = decoder.decrypt(lspbase64).decodeMessage();
;
byte[] encryptedLocationContactMessage = lsp.getEncryptedLocationContactMessage(); byte[] encryptedLocationContactMessage = lsp.getEncryptedLocationContactMessage();
LocationContact decodedLocationContact = new LocationContactMessageEncoder(manualContactTracingAuthoritySecretKey).decode(encryptedLocationContactMessage); LocationContact decodedLocationContact = new LocationContactMessageEncoder(manualContactTracingAuthoritySecretKey).decode(encryptedLocationContactMessage);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment