Index: util/mac/xattr_test.cc |
diff --git a/util/mac/xattr_test.cc b/util/mac/xattr_test.cc |
index c02aa08c383611c5af39f86eeb748e79d3cc7a92..8cb8988c665048106284f4bfc4c67a69ccfb396b 100644 |
--- a/util/mac/xattr_test.cc |
+++ b/util/mac/xattr_test.cc |
@@ -57,35 +57,35 @@ const char kKey[] = "com.google.crashpad.test"; |
TEST_F(Xattr, ReadNonExistentXattr) { |
std::string value; |
- EXPECT_FALSE(ReadXattr(path(), kKey, &value)); |
+ EXPECT_EQ(XattrStatus::kNoAttribute, ReadXattr(path(), kKey, &value)); |
} |
TEST_F(Xattr, WriteAndReadString) { |
std::string value = "hello world"; |
- EXPECT_TRUE(WriteXattr(path(), kKey, value)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattr(path(), kKey, value)); |
std::string actual; |
- EXPECT_TRUE(ReadXattr(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattr(path(), kKey, &actual)); |
EXPECT_EQ(value, actual); |
} |
TEST_F(Xattr, WriteAndReadVeryLongString) { |
std::string value(533, 'A'); |
- EXPECT_TRUE(WriteXattr(path(), kKey, value)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattr(path(), kKey, value)); |
std::string actual; |
- EXPECT_TRUE(ReadXattr(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattr(path(), kKey, &actual)); |
EXPECT_EQ(value, actual); |
} |
TEST_F(Xattr, WriteAndReadBool) { |
- EXPECT_TRUE(WriteXattrBool(path(), kKey, true)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrBool(path(), kKey, true)); |
bool actual = false; |
- EXPECT_TRUE(ReadXattrBool(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrBool(path(), kKey, &actual)); |
EXPECT_TRUE(actual); |
- EXPECT_TRUE(WriteXattrBool(path(), kKey, false)); |
- EXPECT_TRUE(ReadXattrBool(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrBool(path(), kKey, false)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrBool(path(), kKey, &actual)); |
EXPECT_FALSE(actual); |
} |
@@ -93,13 +93,13 @@ TEST_F(Xattr, WriteAndReadInt) { |
int expected = 42; |
int actual; |
- EXPECT_TRUE(WriteXattrInt(path(), kKey, expected)); |
- EXPECT_TRUE(ReadXattrInt(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrInt(path(), kKey, expected)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrInt(path(), kKey, &actual)); |
EXPECT_EQ(expected, actual); |
expected = std::numeric_limits<int>::max(); |
- EXPECT_TRUE(WriteXattrInt(path(), kKey, expected)); |
- EXPECT_TRUE(ReadXattrInt(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrInt(path(), kKey, expected)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrInt(path(), kKey, &actual)); |
EXPECT_EQ(expected, actual); |
} |
@@ -107,13 +107,13 @@ TEST_F(Xattr, WriteAndReadTimeT) { |
time_t expected = time(nullptr); |
time_t actual; |
- EXPECT_TRUE(WriteXattrTimeT(path(), kKey, expected)); |
- EXPECT_TRUE(ReadXattrTimeT(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrTimeT(path(), kKey, expected)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrTimeT(path(), kKey, &actual)); |
EXPECT_EQ(expected, actual); |
expected = std::numeric_limits<time_t>::max(); |
- EXPECT_TRUE(WriteXattrTimeT(path(), kKey, expected)); |
- EXPECT_TRUE(ReadXattrTimeT(path(), kKey, &actual)); |
+ EXPECT_EQ(XattrStatus::kOK, WriteXattrTimeT(path(), kKey, expected)); |
+ EXPECT_EQ(XattrStatus::kOK, ReadXattrTimeT(path(), kKey, &actual)); |
EXPECT_EQ(expected, actual); |
} |