Skip to content

Commit 5a67e10

Browse files
authored
CXX-3233 use common format for unknown error codes (#1449)
1 parent 5bd5293 commit 5a67e10

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/bsoncxx/lib/bsoncxx/v1/exception.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ std::error_category const& source_error_category() {
3030
return "bsoncxx::v1::source_errc";
3131
}
3232

33-
std::string message(int e) const noexcept override {
33+
std::string message(int v) const noexcept override {
3434
using code = v1::source_errc;
3535

36-
switch (static_cast<code>(e)) {
36+
switch (static_cast<code>(v)) {
3737
case code::zero:
3838
return "zero";
3939
case code::bsoncxx:
4040
return "bsoncxx";
4141
case code::bson:
4242
return "bson";
4343
default:
44-
return "unknown: " + std::to_string(e);
44+
return std::string(this->name()) + ':' + std::to_string(v);
4545
}
4646
}
4747
};
@@ -57,18 +57,18 @@ std::error_category const& type_error_category() {
5757
return "bsoncxx::v1::type_errc";
5858
}
5959

60-
std::string message(int e) const noexcept override {
60+
std::string message(int v) const noexcept override {
6161
using code = v1::type_errc;
6262

63-
switch (static_cast<code>(e)) {
63+
switch (static_cast<code>(v)) {
6464
case code::zero:
6565
return "zero";
6666
case code::invalid_argument:
6767
return "invalid argument";
6868
case code::runtime_error:
6969
return "runtime error";
7070
default:
71-
return "unknown: " + std::to_string(e);
71+
return std::string(this->name()) + ':' + std::to_string(v);
7272
}
7373
}
7474
};

src/bsoncxx/test/v1/exception.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ TEST_CASE("source", "[bsoncxx][v1][error]") {
3131
}
3232

3333
SECTION("message") {
34-
CHECK(c.message(-1) == "unknown: -1");
34+
CHECK(c.message(-1) == "bsoncxx::v1::source_errc:-1");
3535
CHECK(c.message(0) == "zero");
3636
CHECK(c.message(1) == "bsoncxx");
3737
CHECK(c.message(2) == "bson");
38-
CHECK(c.message(3) == "unknown: 3");
38+
CHECK(c.message(3) == "bsoncxx::v1::source_errc:3");
3939
}
4040
}
4141

@@ -47,11 +47,11 @@ TEST_CASE("type", "[bsoncxx][v1][error]") {
4747
}
4848

4949
SECTION("message") {
50-
CHECK(c.message(-1) == "unknown: -1");
50+
CHECK(c.message(-1) == "bsoncxx::v1::type_errc:-1");
5151
CHECK(c.message(0) == "zero");
5252
CHECK(c.message(1) == "invalid argument");
5353
CHECK(c.message(2) == "runtime error");
54-
CHECK(c.message(3) == "unknown: 3");
54+
CHECK(c.message(3) == "bsoncxx::v1::type_errc:3");
5555
}
5656
}
5757

0 commit comments

Comments
 (0)