Update the PushEvent to have a nullable PushMessageData

third_party/WebKit/Source/modules/push_messaging/PushMessageDataTest.cpp

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "modules/push_messaging/PushMessageData.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+
+namespace blink {
+namespace {
+
+    const char kPushMessageData[] = "Push Message valid data string.";

[Peter Beverloo, 2016/01/25 17:39:07]

micro nit: namespaces are not indented in either of our styles

[harkness, 2016/01/26 12:07:20]

Done.

+
+    class PushMessageDataTest : public ::testing::Test {

[Peter Beverloo, 2016/01/25 17:39:07]

Since you don't need anything special from the fixture, rather than using
TEST_F() below you could remove this class entirely and use TEST() instead,
which creates a new suite with the given name.

TEST(PushMessageDataTest, ValidPayload) {}  // does not require PushMessageData
to be defined, assumes a ::testing::Test instead.

[harkness, 2016/01/26 12:07:20]

Done.

+    };
+
+    TEST_F(PushMessageDataTest, ValidPayload)
+    {
+        // Create a WebString with the test message, then create a
+        // PushMessageData from that.
+        WebString s(blink::WebString::fromUTF8(kPushMessageData));
+        PushMessageData* data = PushMessageData::create(s);
+
+        EXPECT_NE(data, nullptr);
+        if (data) {

[Peter Beverloo, 2016/01/25 17:39:07]

GTest supports most comparisons using two directives:

ASSERT_*()
EXPECT_*()

The difference is that an ASSERT_*() will abort the test completely (like
throwing an exception), where EXPECT_*() will continue with the next steps in
the test.

In this case, |data| not being a nullptr is a prerequisite for the next
verification to be able to run, so you could rewrite this if-statement by using
an assert/expect combination instead:

ASSERT_NE(data, nullptr);
EXPECT_TRUE(s.equals(data->text()));  // won't run if |data| is a nullptr

[harkness, 2016/01/26 12:07:20]

Done.

+            EXPECT_TRUE(s.equals(data->text()));
+        }
+    }
+
+    TEST_F(PushMessageDataTest, ValidEmptyPayload)
+    {
+        // Create a WebString with a valid but empty test message, then create
+        // a PushMessageData from that.
+        WebString s("");
+        PushMessageData* data = PushMessageData::create(s);
+
+        EXPECT_NE(data, nullptr);
+        if (data) {
+            EXPECT_TRUE(s.equals(data->text()));
+        }
+    }
+
+    TEST_F(PushMessageDataTest, NullPayload)
+    {
+        // Create a PushMessageData with a null payload.
+        WebString s;
+        PushMessageData* data = PushMessageData::create(s);
+
+        EXPECT_EQ(data, nullptr);
+    }
+}
+} // namespace blink