Fixed tests which broke when we changed default min version.

test/src/Message2_1Test.cc

@@ -132,8 +132,7 @@ namespace {
 }  // namespace
 
 
-
-TEST_F(Message2_1Test, check_message2_1_recip_2_0) {
+TEST_F(Message2_1Test, check_message2_1_recip_default_ver) {
 
     pEp_identity* alice = NULL;
     pEp_identity* carol = NULL;
@@ -150,11 +149,11 @@ TEST_F(Message2_1Test, check_message2_1_recip_2_0) {
     ASSERT_OK;
     ASSERT_NOTNULL(carol);
 
-    // default should be 2.0 after setting pep status
+    // default should be 2.1 after setting pep status
     status = update_identity(session, carol);
     ASSERT_OK;
     ASSERT_EQ(carol->major_ver , 2);
-    ASSERT_EQ(carol->minor_ver , 0);
+    ASSERT_EQ(carol->minor_ver , 1);
     // generate message
     pEp_identity* carol_to = new_identity(carol->address, NULL, NULL, NULL);
 
@@ -170,9 +169,9 @@ TEST_F(Message2_1Test, check_message2_1_recip_2_0) {
     status = encrypt_message(session, msg, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
     ASSERT_OK;
 
-    // ensure sent message is in 2.0 format
+    // ensure sent message is in 2.1 format
     unsigned int major = 2;
-    unsigned int minor = 0;
+    unsigned int minor = 1;
     ASSERT_TRUE(verify_message_version_produced(enc_msg, &major, &minor));
 
     free_identity(carol);
@@ -333,6 +332,7 @@ TEST_F(Message2_1Test, check_message2_1_recip_1_0_from_msg_OpenPGP) {
     free(mod_src);
 }
 
+// Note, this will now create a 2.1 message ANYWAY.
 TEST_F(Message2_1Test, check_message2_1_recip_2_0_from_msg) {
     // receive 2.0 message
     pEp_identity* carol = NULL;
@@ -369,9 +369,9 @@ TEST_F(Message2_1Test, check_message2_1_recip_2_0_from_msg) {
     status = encrypt_message(session, msg, NULL, &enc_msg, PEP_enc_PGP_MIME, 0);
     ASSERT_OK;
 
-    // ensure sent message is in 1.0 format
+    // ensure sent message is in 2.1 format
     unsigned int major = 2;
-    unsigned int minor = 0;
+    unsigned int minor = 1;
     ASSERT_TRUE(verify_message_version_produced(enc_msg, &major, &minor));
 
     free_message(msg);