pEp.foundation
/
PityTest11
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

module 'test_utils' const-ness non-sense

master
heck 3 years ago
parent
65f9d72709
commit
09c1ab5b5f
2 changed files with 47 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/test_utils.cc
  2. 34
      src/test_utils.hh

64
src/test_utils.cc
View File

@ -14,91 +14,91 @@ namespace pEp {
namespace Utils { namespace Utils {
//Ident //Ident
pEpIdent wrap(::pEp_identity *const ident) pEpIdent wrap(::pEp_identity *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdent(ident, [](::pEp_identity *) {}); auto ret = pEpIdent{ ident, [](::pEp_identity *) {} };
return ret; return ret;
} }
pEpIdent appropriate(::pEp_identity *const ident) pEpIdent appropriate(::pEp_identity *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdent(ident, ::free_identity); auto ret = pEpIdent{ ident, ::free_identity };
return ret; return ret;
} }
pEpIdent dup(const ::pEp_identity *const ident) pEpIdent dup(const ::pEp_identity *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdent(::identity_dup(ident), ::free_identity); auto ret = pEpIdent{ ::identity_dup(ident), ::free_identity };
return ret; return ret;
} }
pEpIdent kill(::pEp_identity *const ident) pEpIdent kill(::pEp_identity *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdent(::identity_dup(ident), ::free_identity); auto ret = pEpIdent{ ::identity_dup(ident), ::free_identity };
::free_identity(ident); ::free_identity(ident);
return ret; return ret;
} }
//IdentityList //IdentityList
pEpIdentList wrap(::identity_list *const ident) pEpIdentList wrap(::identity_list *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdentList(ident, [](::identity_list *) {}); auto ret = pEpIdentList{ ident, [](::identity_list *) {} };
return ret; return ret;
} }
pEpIdentList appropriate(::identity_list *const ident) pEpIdentList appropriate(::identity_list *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdentList(ident, ::free_identity_list); auto ret = pEpIdentList{ ident, ::free_identity_list };
return ret; return ret;
} }
pEpIdentList dup(const ::identity_list *const ident) pEpIdentList dup(const ::identity_list *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdentList(::identity_list_dup(ident), ::free_identity_list); auto ret = pEpIdentList{ ::identity_list_dup(ident), ::free_identity_list };
return ret; return ret;
} }
pEpIdentList kill(::identity_list *const ident) pEpIdentList kill(::identity_list *ident)
{ {
assert(ident); assert(ident);
auto ret = pEpIdentList(::identity_list_dup(ident), ::free_identity_list); auto ret = pEpIdentList{ ::identity_list_dup(ident), ::free_identity_list };
::free_identity_list(ident); ::free_identity_list(ident);
return ret; return ret;
} }
//Message //Message
pEpMessage wrap(::message *const msg) pEpMessage wrap(::message *msg)
{ {
assert(msg); assert(msg);
auto ret = pEpMessage(msg, [](::message *) {}); auto ret = pEpMessage{ msg, [](::message *) {} };
return ret; return ret;
} }
pEpMessage appropriate(::message *const msg) pEpMessage appropriate(::message *msg)
{ {
assert(msg); assert(msg);
auto ret = pEpMessage(msg, ::free_message); auto ret = pEpMessage{ msg, ::free_message };
return ret; return ret;
} }
pEpMessage dup(const ::message *const msg) pEpMessage dup(const ::message *msg)
{ {
assert(msg); assert(msg);
auto ret = pEpMessage(::message_dup(msg), ::free_message); auto ret = pEpMessage{ ::message_dup(msg), ::free_message };
return ret; return ret;
} }
pEpMessage kill(::message *const msg) pEpMessage kill(::message *msg)
{ {
assert(msg); assert(msg);
auto ret = pEpMessage(::message_dup(msg), ::free_message); auto ret = pEpMessage{ ::message_dup(msg), ::free_message };
::free_message(msg); ::free_message(msg);
return ret; return ret;
} }
@ -122,11 +122,7 @@ namespace pEp {
{ {
std::string name; std::string name;
::pEp_identity *ident = nullptr; ::pEp_identity *ident = nullptr;
ident = ::new_identity( ident = ::new_identity(strdup(address.c_str()), "", "", ("partner " + address).c_str());
strdup(address.c_str()),
"",
"",
("partner " + address).c_str());
ident->me = false; ident->me = false;
return appropriate(ident); return appropriate(ident);
@ -170,7 +166,7 @@ namespace pEp {
return createMessage(from, to_ident, longmsg); return createMessage(from, to_ident, longmsg);
} }
std::string mimeEncode(const pEpMessage msg) std::string mimeEncode(pEpMessage msg)
{ {
char *mimetext; char *mimetext;
PEP_STATUS status = ::mime_encode_message(msg.get(), false, &mimetext, false); PEP_STATUS status = ::mime_encode_message(msg.get(), false, &mimetext, false);
@ -193,7 +189,7 @@ namespace pEp {
return pEpMessage(msg, ::free_message); return pEpMessage(msg, ::free_message);
} }
EncryptResult encryptMessage(const pEpMessage msg) EncryptResult encryptMessage(pEpMessage msg)
{ {
pEpMessage msg_out; pEpMessage msg_out;
bool could_encrypt = false; bool could_encrypt = false;
@ -218,7 +214,7 @@ namespace pEp {
} }
DecryptResult decryptMessage(const pEpMessage msg, ::PEP_decrypt_flags_t *flags) DecryptResult decryptMessage(pEpMessage msg, ::PEP_decrypt_flags_t *flags)
{ {
pEpMessage msg_out; pEpMessage msg_out;
bool was_encrypted = false; bool was_encrypted = false;
@ -244,13 +240,13 @@ namespace pEp {
return DecryptResult(msg_out, rating, kl, flags, was_encrypted); return DecryptResult(msg_out, rating, kl, flags, was_encrypted);
} }
DecryptResult decryptMessage(const pEpMessage msg) DecryptResult decryptMessage(pEpMessage msg)
{ {
::PEP_decrypt_flags_t dummy{ 0 }; ::PEP_decrypt_flags_t dummy{ 0 };
return decryptMessage(msg, &dummy); return decryptMessage(msg, &dummy);
} }
EncryptResult encryptAndEncode(const pEpMessage msg) EncryptResult encryptAndEncode(pEpMessage msg)
{ {
EncryptResult ret = encryptMessage(msg); EncryptResult ret = encryptMessage(msg);
std::string mime_text = mimeEncode(std::get<0>(ret)); std::string mime_text = mimeEncode(std::get<0>(ret));

34
src/test_utils.hh
View File

@ -89,22 +89,22 @@ namespace pEp {
// Datatypes // Datatypes
//Ident //Ident
pEpIdent wrap(::pEp_identity *const ident); pEpIdent wrap(::pEp_identity *ident);
pEpIdent appropriate(::pEp_identity *const ident); pEpIdent appropriate(::pEp_identity *ident);
pEpIdent dup(const ::pEp_identity *const ident); pEpIdent dup(const ::pEp_identity *ident);
pEpIdent kill(::pEp_identity *const ident); pEpIdent kill(::pEp_identity *ident);
//IdentityList //IdentityList
pEpIdentList wrap(::identity_list *const ident); pEpIdentList wrap(::identity_list *ident);
pEpIdentList appropriate(::identity_list *const ident); pEpIdentList appropriate(::identity_list *ident);
pEpIdentList dup(const ::identity_list *const ident); pEpIdentList dup(const ::identity_list *ident);
pEpIdentList kill(::identity_list *const ident); pEpIdentList kill(::identity_list *ident);
//Message //Message
pEpMessage wrap(::message *const msg); pEpMessage wrap(::message *msg);
pEpMessage appropriate(::message *const msg); pEpMessage appropriate(::message *msg);
pEpMessage dup(const ::message *const msg); pEpMessage dup(const ::message *msg);
pEpMessage kill(::message *const msg); pEpMessage kill(::message *msg);
// helpers // helpers
pEpIdent createOwnIdent(const std::string &address); pEpIdent createOwnIdent(const std::string &address);
@ -115,14 +115,14 @@ namespace pEp {
pEpMessage createMessage(pEpIdent from, const std::string &to_addr, const std::string &longmsg); pEpMessage createMessage(pEpIdent from, const std::string &to_addr, const std::string &longmsg);
std::string mimeEncode(const pEpMessage msg); std::string mimeEncode(pEpMessage msg);
pEpMessage mimeDecode(const std::string &mime_text); pEpMessage mimeDecode(const std::string &mime_text);
EncryptResult encryptMessage(const pEpMessage msg); EncryptResult encryptMessage(pEpMessage msg);
DecryptResult decryptMessage(const pEpMessage msg, ::PEP_decrypt_flags_t *flags); DecryptResult decryptMessage(pEpMessage msg, ::PEP_decrypt_flags_t *flags);
DecryptResult decryptMessage(const pEpMessage msg); DecryptResult decryptMessage(pEpMessage msg);
EncryptResult encryptAndEncode(const pEpMessage msg); EncryptResult encryptAndEncode(pEpMessage msg);
DecryptResult decryptAndDecode(const std::string &mime_data); DecryptResult decryptAndDecode(const std::string &mime_data);
} // namespace Utils } // namespace Utils

Write Preview
Loading…
Cancel
Save