| Index: third_party/WebKit/Source/wtf/OptionalTest.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/OptionalTest.cpp b/third_party/WebKit/Source/wtf/OptionalTest.cpp
|
| index e96d509db8405297959947c447d05d96d66d219a..683354583407a0ef1797a294890945eaab55f781 100644
|
| --- a/third_party/WebKit/Source/wtf/OptionalTest.cpp
|
| +++ b/third_party/WebKit/Source/wtf/OptionalTest.cpp
|
| @@ -10,53 +10,49 @@ namespace WTF {
|
| namespace {
|
|
|
| struct IntBox {
|
| - IntBox(int n) : number(n) { }
|
| - int number;
|
| + IntBox(int n) : number(n) {}
|
| + int number;
|
| };
|
|
|
| class DestructionNotifier {
|
| -public:
|
| - DestructionNotifier(bool& flag) : m_flag(flag) { }
|
| - ~DestructionNotifier() { m_flag = true; }
|
| -private:
|
| - bool& m_flag;
|
| + public:
|
| + DestructionNotifier(bool& flag) : m_flag(flag) {}
|
| + ~DestructionNotifier() { m_flag = true; }
|
| +
|
| + private:
|
| + bool& m_flag;
|
| };
|
|
|
| -TEST(OptionalTest, BooleanTest)
|
| -{
|
| - Optional<int> optional;
|
| - EXPECT_FALSE(optional);
|
| - optional.emplace(0);
|
| - EXPECT_TRUE(optional);
|
| +TEST(OptionalTest, BooleanTest) {
|
| + Optional<int> optional;
|
| + EXPECT_FALSE(optional);
|
| + optional.emplace(0);
|
| + EXPECT_TRUE(optional);
|
| }
|
|
|
| -TEST(OptionalTest, Dereference)
|
| -{
|
| - Optional<int> optional;
|
| - optional.emplace(1);
|
| - EXPECT_EQ(1, *optional);
|
| +TEST(OptionalTest, Dereference) {
|
| + Optional<int> optional;
|
| + optional.emplace(1);
|
| + EXPECT_EQ(1, *optional);
|
|
|
| - Optional<IntBox> optionalIntbox;
|
| - optionalIntbox.emplace(42);
|
| - EXPECT_EQ(42, optionalIntbox->number);
|
| + Optional<IntBox> optionalIntbox;
|
| + optionalIntbox.emplace(42);
|
| + EXPECT_EQ(42, optionalIntbox->number);
|
| }
|
|
|
| -TEST(OptionalTest, DestructorCalled)
|
| -{
|
| - // Destroying a disengaged optional shouldn't do anything.
|
| - {
|
| - Optional<DestructionNotifier> optional;
|
| - }
|
| -
|
| - // Destroying an engaged optional should call the destructor.
|
| - bool isDestroyed = false;
|
| - {
|
| - Optional<DestructionNotifier> optional;
|
| - optional.emplace(isDestroyed);
|
| - EXPECT_FALSE(isDestroyed);
|
| - }
|
| - EXPECT_TRUE(isDestroyed);
|
| +TEST(OptionalTest, DestructorCalled) {
|
| + // Destroying a disengaged optional shouldn't do anything.
|
| + { Optional<DestructionNotifier> optional; }
|
| +
|
| + // Destroying an engaged optional should call the destructor.
|
| + bool isDestroyed = false;
|
| + {
|
| + Optional<DestructionNotifier> optional;
|
| + optional.emplace(isDestroyed);
|
| + EXPECT_FALSE(isDestroyed);
|
| + }
|
| + EXPECT_TRUE(isDestroyed);
|
| }
|
|
|
| -} // namespace
|
| -} // namespace WTF
|
| +} // namespace
|
| +} // namespace WTF
|
|
|