Browse Source

listmanager_dummy - Separate DoesNotExistException into ListDoesNotExistException and MemberDoesNotExistException

LIB-11
heck 4 years ago
parent
commit
4ab61fccdb
  1. 12
      src/listmanager_dummy.cc
  2. 8
      src/listmanager_dummy.hh
  3. 12
      test/test_listmanager_dummy.cc

12
src/listmanager_dummy.cc

@ -122,7 +122,7 @@ namespace pEp {
{ {
pEpLogClass("list_delete(addr_list: \"" + addr_list + "\")"); pEpLogClass("list_delete(addr_list: \"" + addr_list + "\")");
if (!list_exists(addr_list)) { if (!list_exists(addr_list)) {
DoesNotExistException e{ "list_delete(addr_list: \"" + addr_list + ListDoesNotExistException e{ "list_delete(addr_list: \"" + addr_list +
"\") - List does not exist" }; "\") - List does not exist" };
throw e; throw e;
} }
@ -144,7 +144,7 @@ namespace pEp {
pEpLogClass( pEpLogClass(
"member_add(addr_list: \"" + addr_list + "\", addr_member: \"" + addr_member + "\")"); "member_add(addr_list: \"" + addr_list + "\", addr_member: \"" + addr_member + "\")");
if (!list_exists(addr_list)) { if (!list_exists(addr_list)) {
DoesNotExistException e{ "member_add(addr_list: \"" + addr_list + "\", addr_member: \"" + ListDoesNotExistException e{ "member_add(addr_list: \"" + addr_list + "\", addr_member: \"" +
addr_member + "\") - list does not exist" }; addr_member + "\") - list does not exist" };
throw e; throw e;
} }
@ -172,14 +172,14 @@ namespace pEp {
pEpLogClass( pEpLogClass(
"member_remove(addr_list: \"" + addr_list + "\", addr_member: '\"" + addr_member + "\")"); "member_remove(addr_list: \"" + addr_list + "\", addr_member: '\"" + addr_member + "\")");
if (!list_exists(addr_list)) { if (!list_exists(addr_list)) {
DoesNotExistException e{ "member_remove(addr_list: \"" + addr_list + ListDoesNotExistException e{ "member_remove(addr_list: \"" + addr_list +
"\", addr_member: '\"" + addr_member + "\", addr_member: '\"" + addr_member +
"\") - list does not exist" }; "\") - list does not exist" };
throw e; throw e;
} }
if (!member_exists(addr_list, addr_member)) { if (!member_exists(addr_list, addr_member)) {
DoesNotExistException e{ "member_remove(addr_list: \"" + addr_list + MemberDoesNotExistException e{ "member_remove(addr_list: \"" + addr_list +
"\", addr_member: '\"" + addr_member + "\", addr_member: '\"" + addr_member +
"\") - member does not exist" }; "\") - member does not exist" };
throw e; throw e;
@ -226,7 +226,7 @@ namespace pEp {
{ {
pEpLogClass("moderator(list_address:\"" + addr_list + "\")"); pEpLogClass("moderator(list_address:\"" + addr_list + "\")");
if (!list_exists(addr_list)) { if (!list_exists(addr_list)) {
DoesNotExistException e{ "moderator(list_address:\"" + addr_list + ListDoesNotExistException e{ "moderator(list_address:\"" + addr_list +
"\") - List does not exist" }; "\") - List does not exist" };
throw e; throw e;
} }
@ -260,7 +260,7 @@ namespace pEp {
{ {
pEpLogClass("members(list_address:\"" + addr_list + "\")"); pEpLogClass("members(list_address:\"" + addr_list + "\")");
if (!list_exists(addr_list)) { if (!list_exists(addr_list)) {
DoesNotExistException e{ "members(list_address:\"" + addr_list + ListDoesNotExistException e{ "members(list_address:\"" + addr_list +
"\") - List does not exist" }; "\") - List does not exist" };
throw e; throw e;
} }

8
src/listmanager_dummy.hh

@ -46,9 +46,13 @@ namespace pEp {
public: public:
DBException(const std::string& string) : runtime_error(string) {} DBException(const std::string& string) : runtime_error(string) {}
}; };
class DoesNotExistException : public std::runtime_error { class ListDoesNotExistException : public std::runtime_error {
public: public:
DoesNotExistException(const std::string& string) : runtime_error(string) {} ListDoesNotExistException(const std::string& string) : runtime_error(string) {}
};
class MemberDoesNotExistException : public std::runtime_error {
public:
MemberDoesNotExistException(const std::string& string) : runtime_error(string) {}
}; };
class AlreadyExistsException : public std::runtime_error { class AlreadyExistsException : public std::runtime_error {
public: public:

12
test/test_listmanager_dummy.cc

@ -203,7 +203,7 @@ int main(int argc, char* argv[])
try { try {
lmd.list_delete("does_not_exist_for_sure"); lmd.list_delete("does_not_exist_for_sure");
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const ListDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);
@ -233,7 +233,7 @@ int main(int argc, char* argv[])
try { try {
lmd.member_add("does_not_exist_for_sure", model.lists.at(0).members.at(0)); lmd.member_add("does_not_exist_for_sure", model.lists.at(0).members.at(0));
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const ListDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);
@ -249,7 +249,7 @@ int main(int argc, char* argv[])
try { try {
lmd.member_remove(model.lists.at(0).addr, "does_not_exist_for_sure"); lmd.member_remove(model.lists.at(0).addr, "does_not_exist_for_sure");
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const MemberDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);
@ -263,7 +263,7 @@ int main(int argc, char* argv[])
try { try {
lmd.member_remove("does_not_exist_for_sure", model.lists.at(0).members.at(0)); lmd.member_remove("does_not_exist_for_sure", model.lists.at(0).members.at(0));
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const ListDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);
@ -279,7 +279,7 @@ int main(int argc, char* argv[])
try { try {
lmd.moderator("does_not_exist_for_sure"); lmd.moderator("does_not_exist_for_sure");
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const ListDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);
@ -295,7 +295,7 @@ int main(int argc, char* argv[])
try { try {
lmd.members("does_not_exist_for_sure"); lmd.members("does_not_exist_for_sure");
assert(false); assert(false);
} catch (const DoesNotExistException& e) { } catch (const ListDoesNotExistException& e) {
log(nested_exception_to_string(e)); log(nested_exception_to_string(e));
} catch (...) { } catch (...) {
assert(false); assert(false);

Loading…
Cancel
Save