Skip to content

Commit f5d62be

Browse files
author
Stanislav Angelovic
committed
fix: address review comments
1 parent 70cf302 commit f5d62be

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/Error.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,17 @@
2929
#include "ScopeGuard.h"
3030

3131
#include SDBUS_HEADER
32-
#include <cassert>
3332

3433
namespace sdbus
3534
{
36-
sdbus::Error createError(int errNo, std::string customMsg)
35+
Error createError(int errNo, std::string customMsg)
3736
{
3837
sd_bus_error sdbusError = SD_BUS_ERROR_NULL;
3938
sd_bus_error_set_errno(&sdbusError, errNo);
4039
SCOPE_EXIT{ sd_bus_error_free(&sdbusError); };
4140

4241
Error::Name name(sd_bus_error_is_set(&sdbusError) ? sdbusError.name : "");
43-
std::string message(sd_bus_error_is_set(&sdbusError)? std::move(customMsg) : "");
42+
std::string message(std::move(customMsg));
4443
if (!message.empty() && sdbusError.message != nullptr)
4544
{
4645
message.append(" (");

tests/unittests/Types_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,6 @@ TEST(AnErrorFactory, CreatesEmptyInvalidErrorWhenErrnoIsZero)
479479
auto error = sdbus::createError(0, "custom message");
480480

481481
EXPECT_TRUE(error.getName().empty());
482-
EXPECT_TRUE(error.getMessage().empty());
482+
EXPECT_THAT(error.getMessage(), Eq<std::string>("custom message"));
483483
EXPECT_FALSE(error.isValid());
484484
}

0 commit comments

Comments
 (0)