Commit 5a67e10

authored

CXX-3233 use common format for unknown error codes (#1449)

1 parent 5bd5293 commit 5a67e10Copy full SHA for 5a67e10

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,18 @@ std::error_category const& source_error_category() {`
`30`	`30`	`return "bsoncxx::v1::source_errc";`
`31`	`31`	`}`
`32`	`32`
`33`		`- std::string message(int e) const noexcept override {`
	`33`	`+ std::string message(int v) const noexcept override {`
`34`	`34`	`using code = v1::source_errc;`
`35`	`35`
`36`		`- switch (static_cast<code>(e)) {`
	`36`	`+ switch (static_cast<code>(v)) {`
`37`	`37`	`case code::zero:`
`38`	`38`	`return "zero";`
`39`	`39`	`case code::bsoncxx:`
`40`	`40`	`return "bsoncxx";`
`41`	`41`	`case code::bson:`
`42`	`42`	`return "bson";`
`43`	`43`	`default:`
`44`		`- return "unknown: "+ std::to_string(e);`
	`44`	`+ return std::string(this->name()) + ':'+ std::to_string(v);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`};`
`@@ -57,18 +57,18 @@ std::error_category const& type_error_category() {`
`57`	`57`	`return "bsoncxx::v1::type_errc";`
`58`	`58`	`}`
`59`	`59`
`60`		`- std::string message(int e) const noexcept override {`
	`60`	`+ std::string message(int v) const noexcept override {`
`61`	`61`	`using code = v1::type_errc;`
`62`	`62`
`63`		`- switch (static_cast<code>(e)) {`
	`63`	`+ switch (static_cast<code>(v)) {`
`64`	`64`	`case code::zero:`
`65`	`65`	`return "zero";`
`66`	`66`	`case code::invalid_argument:`
`67`	`67`	`return "invalid argument";`
`68`	`68`	`case code::runtime_error:`
`69`	`69`	`return "runtime error";`
`70`	`70`	`default:`
`71`		`- return "unknown: "+ std::to_string(e);`
	`71`	`+ return std::string(this->name()) + ':'+ std::to_string(v);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`};`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ TEST_CASE("source", "[bsoncxx][v1][error]") {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`SECTION("message") {`
`34`		`- CHECK(c.message(-1) == "unknown: -1");`
	`34`	`+ CHECK(c.message(-1) == "bsoncxx::v1::source_errc:-1");`
`35`	`35`	`CHECK(c.message(0) == "zero");`
`36`	`36`	`CHECK(c.message(1) == "bsoncxx");`
`37`	`37`	`CHECK(c.message(2) == "bson");`
`38`		`- CHECK(c.message(3) == "unknown: 3");`
	`38`	`+ CHECK(c.message(3) == "bsoncxx::v1::source_errc:3");`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -47,11 +47,11 @@ TEST_CASE("type", "[bsoncxx][v1][error]") {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`SECTION("message") {`
`50`		`- CHECK(c.message(-1) == "unknown: -1");`
	`50`	`+ CHECK(c.message(-1) == "bsoncxx::v1::type_errc:-1");`
`51`	`51`	`CHECK(c.message(0) == "zero");`
`52`	`52`	`CHECK(c.message(1) == "invalid argument");`
`53`	`53`	`CHECK(c.message(2) == "runtime error");`
`54`		`- CHECK(c.message(3) == "unknown: 3");`
	`54`	`+ CHECK(c.message(3) == "bsoncxx::v1::type_errc:3");`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`

Comments

(0)