some test changes - switching branches so I can check a case

test/src/URIAddressTest.cc

@@ -11,6 +11,7 @@
 #include "TestConstants.h"
 
 #include "pEpEngine.h"
+#include "pEp_internal.h"
 
 
 
@@ -206,6 +207,16 @@ TEST_F(URIAddressTest, check_uri_address_encrypt_2_keys_no_uname) {
     pEp_identity* you = new_identity(uri_addr_b, NULL, NULL, NULL);
     status = update_identity(session, you);
     ASSERT_EQ(status, PEP_STATUS_OK);
+    // Post-key-election: has to be set
+    ASSERT_NULL(you->fpr);
+    you->fpr = strdup(fpr_b);
+    status = set_valid_default_fpr(session, you);
+    ASSERT_OK;
+    free_identity(you);
+    you = new_identity(uri_addr_b, NULL, NULL, NULL);
+    status = update_identity(session, you);
+    ASSERT_EQ(status, PEP_STATUS_OK);
+
     ASSERT_NE(you->fpr, nullptr);
     ASSERT_NE(you->username, nullptr);    
     ASSERT_STREQ(you->fpr, fpr_b);
@@ -257,9 +268,15 @@ TEST_F(URIAddressTest, check_uri_address_encrypt) {
     ASSERT_EQ(status , PEP_STATUS_OK);
     ASSERT_TRUE(keylist && keylist->value);
 
+    // Ah, but now there is no key election, so we have to set it explicitly.
+    you->fpr = strdup(keylist->value);
+    set_valid_default_fpr(session, you);
+    free(you->fpr);
+    you->fpr = NULL;
+
     status = update_identity(session, you);
     ASSERT_EQ(status , PEP_STATUS_OK);
-    ASSERT_TRUE(you->fpr && you->fpr[0] != '\0');
+    ASSERT_FALSE(EMPTYSTR(you->fpr));
 
     message* msg = new_message(PEP_dir_outgoing);
 

test/src/test_util.cc

@@ -766,6 +766,19 @@ pEp_error:
 
 #endif
 
+PEP_STATUS set_valid_default_fpr(PEP_SESSION session, pEp_identity* ident) {
+    if (EMPTYSTR(ident->fpr))
+        return PEP_ILLEGAL_VALUE;
+    PEP_STATUS status = validate_fpr(session, ident, true, true, true);
+    if (status == PEP_STATUS_OK)
+        status = set_identity(session, ident);            
+    else { 
+        free(ident->fpr);
+        ident->fpr = NULL;                            
+    }
+    return status;
+}
+
 PEP_STATUS set_up_preset(PEP_SESSION session,
                          pEp_test_ident_preset preset_name,
                          bool set_ident,

test/src/test_util.h

@@ -137,6 +137,7 @@ class NullBuffer : public std::streambuf {
 };                         
                          
 PEP_STATUS config_valid_passphrase(PEP_SESSION session, const char* fpr, std::vector<std::string> passphrases);
+PEP_STATUS set_valid_default_fpr(PEP_SESSION session, pEp_identity* ident);
 
 void print_mail(message* msg);