Index: chrome/common/media_router/discovery/media_sink_internal_unittest.cc |
diff --git a/chrome/common/media_router/discovery/media_sink_internal_unittest.cc b/chrome/common/media_router/discovery/media_sink_internal_unittest.cc |
index 220ecda6f33a26c557b9a49f973f1848dfcdbfcb..2267f6efb43b55c31e7c478b56db1a177e41d783 100644 |
--- a/chrome/common/media_router/discovery/media_sink_internal_unittest.cc |
+++ b/chrome/common/media_router/discovery/media_sink_internal_unittest.cc |
@@ -3,67 +3,61 @@ |
// found in the LICENSE file. |
#include "chrome/common/media_router/discovery/media_sink_internal.h" |
- |
-#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-namespace media_router { |
- |
-class MediaSinkInternalTest : public ::testing::Test { |
- public: |
- MediaSinkInternalTest() |
- : media_sink_(sink_id_, sink_name_, MediaSink::IconType::CAST) {} |
- |
- DialSinkExtraData CreateDialSinkExtraData() { |
- return CreateDialSinkExtraData(model_name_, ip_address_, app_url_); |
- } |
- |
- DialSinkExtraData CreateDialSinkExtraData(const std::string& model_name, |
- const std::string& ip_address, |
- const std::string& app_url) { |
- DialSinkExtraData dial_extra_data; |
- EXPECT_TRUE(dial_extra_data.ip_address.AssignFromIPLiteral(ip_address)); |
- dial_extra_data.model_name = model_name; |
- dial_extra_data.app_url = GURL(app_url); |
- |
- return dial_extra_data; |
- } |
+namespace { |
+constexpr char kSinkId[] = "sinkId123"; |
+constexpr char kSinkName[] = "The sink"; |
+constexpr char kIPAddress[] = "192.168.1.2"; |
+constexpr char kModelName[] = "model name"; |
+constexpr char kAppUrl[] = "https://example.com"; |
+ |
+media_router::DialSinkExtraData CreateDialSinkExtraData( |
+ const std::string& model_name, |
+ const std::string& ip_address, |
+ const std::string& app_url) { |
+ media_router::DialSinkExtraData dial_extra_data; |
+ EXPECT_TRUE(dial_extra_data.ip_address.AssignFromIPLiteral(ip_address)); |
+ dial_extra_data.model_name = model_name; |
+ dial_extra_data.app_url = GURL(app_url); |
+ |
+ return dial_extra_data; |
+} |
- CastSinkExtraData CreateCastSinkExtraData() { |
- return CreateCastSinkExtraData(model_name_, ip_address_, 2, 3); |
- } |
+media_router::CastSinkExtraData CreateCastSinkExtraData( |
+ const std::string& model_name, |
+ const std::string& ip_address, |
+ uint8_t capabilities, |
+ int cast_channel_id) { |
+ media_router::CastSinkExtraData cast_extra_data; |
+ EXPECT_TRUE(cast_extra_data.ip_address.AssignFromIPLiteral(ip_address)); |
+ cast_extra_data.model_name = model_name; |
+ cast_extra_data.capabilities = 2; |
+ cast_extra_data.cast_channel_id = 3; |
+ return cast_extra_data; |
+} |
- CastSinkExtraData CreateCastSinkExtraData(const std::string& model_name, |
- const std::string& ip_address, |
- uint8_t capabilities, |
- int cast_channel_id) { |
- CastSinkExtraData cast_extra_data; |
- EXPECT_TRUE(cast_extra_data.ip_address.AssignFromIPLiteral(ip_address)); |
- cast_extra_data.model_name = model_name; |
- cast_extra_data.capabilities = 2; |
- cast_extra_data.cast_channel_id = 3; |
- return cast_extra_data; |
- } |
+// static |
+media_router::DialSinkExtraData CreateDialSinkExtraData() { |
+ return CreateDialSinkExtraData(kModelName, kIPAddress, kAppUrl); |
+} |
- MediaSink media_sink() { return media_sink_; } |
+// static |
+media_router::CastSinkExtraData CreateCastSinkExtraData() { |
+ return CreateCastSinkExtraData(kModelName, kIPAddress, 2, 3); |
+} |
- private: |
- std::string sink_id_ = "sinkId123"; |
- std::string sink_name_ = "The sink"; |
- std::string ip_address_ = "192.168.1.2"; |
- std::string model_name_ = "model name"; |
- std::string app_url_ = "https://example.com"; |
+} // namespace |
- MediaSink media_sink_; |
-}; |
+namespace media_router { |
-TEST_F(MediaSinkInternalTest, TestIsValidSinkId) { |
+TEST(MediaSinkInternalTest, TestIsValidSinkId) { |
EXPECT_FALSE(MediaSinkInternal::IsValidSinkId("")); |
EXPECT_TRUE(MediaSinkInternal::IsValidSinkId("rjuKv_yxhY4jg7QBIp0kbngLjR6A")); |
} |
-TEST_F(MediaSinkInternalTest, TestConstructorAndAssignment) { |
- MediaSink sink = media_sink(); |
+TEST(MediaSinkInternalTest, TestConstructorAndAssignment) { |
+ MediaSink sink(kSinkId, kSinkName, MediaSink::IconType::CAST); |
DialSinkExtraData dial_extra_data = CreateDialSinkExtraData(); |
CastSinkExtraData cast_extra_data = CreateCastSinkExtraData(); |
@@ -99,8 +93,8 @@ TEST_F(MediaSinkInternalTest, TestConstructorAndAssignment) { |
} |
} |
-TEST_F(MediaSinkInternalTest, TestSetExtraData) { |
- MediaSink sink = media_sink(); |
+TEST(MediaSinkInternalTest, TestSetExtraData) { |
+ MediaSink sink(kSinkId, kSinkName, MediaSink::IconType::CAST); |
DialSinkExtraData dial_extra_data = CreateDialSinkExtraData(); |
CastSinkExtraData cast_extra_data = CreateCastSinkExtraData(); |