| Index: chromecast/base/serializers_unittest.cc
|
| diff --git a/chromecast/base/serializers_unittest.cc b/chromecast/base/serializers_unittest.cc
|
| index d2d29ed6b0758752ee7f46551fce0bb377b718ae..5724b4b0b793ce014d4458dde1bb2f589057350b 100644
|
| --- a/chromecast/base/serializers_unittest.cc
|
| +++ b/chromecast/base/serializers_unittest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/files/file_util.h"
|
| #include "base/values.h"
|
| +#include "chromecast/base/scoped_temp_file.h"
|
| #include "chromecast/base/serializers.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -24,7 +25,6 @@ const char kProperJsonString[] =
|
| const char kPoorlyFormedJsonString[] = "{\"key\":";
|
| const char kTestKey[] = "test_key";
|
| const char kTestValue[] = "test_value";
|
| -const char kTempfileName[] = "temp";
|
|
|
| } // namespace
|
|
|
| @@ -76,73 +76,40 @@ TEST(SerializeToJson, PopulatedValue) {
|
| EXPECT_TRUE(new_value->Equals(&orig_value));
|
| }
|
|
|
| -class ScopedTempFile {
|
| - public:
|
| - ScopedTempFile() {
|
| - // Create a temporary file
|
| - base::CreateNewTempDirectory("", &dir_);
|
| - file_ = dir_.Append(kTempfileName);
|
| - }
|
| -
|
| - ~ScopedTempFile() {
|
| - // Remove the temp directory.
|
| - base::DeleteFile(dir_, true);
|
| - }
|
| -
|
| - const base::FilePath& file() const { return file_; }
|
| - const base::FilePath& dir() const { return dir_; }
|
| -
|
| - std::size_t Write(const char* str) {
|
| - return static_cast<std::size_t>(base::WriteFile(file_, str, strlen(str)));
|
| - }
|
| -
|
| - std::string Read() {
|
| - std::string result;
|
| - ReadFileToString(file_, &result);
|
| - return result;
|
| - }
|
| -
|
| - private:
|
| - base::FilePath file_;
|
| - base::FilePath dir_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ScopedTempFile);
|
| -};
|
| -
|
| TEST(DeserializeJsonFromFile, NoFile) {
|
| - ScopedTempFile temp;
|
| -
|
| - ASSERT_TRUE(base::IsDirectoryEmpty(temp.dir()));
|
| - scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.file());
|
| + scoped_ptr<base::Value> value =
|
| + DeserializeJsonFromFile(base::FilePath("/file/does/not/exist.json"));
|
| EXPECT_EQ(nullptr, value.get());
|
| }
|
|
|
| TEST(DeserializeJsonFromFile, EmptyString) {
|
| ScopedTempFile temp;
|
| - EXPECT_EQ(strlen(""), temp.Write(""));
|
| - scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.file());
|
| + EXPECT_EQ(static_cast<int>(strlen("")), temp.Write(""));
|
| + scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.path());
|
| EXPECT_EQ(nullptr, value.get());
|
| }
|
|
|
| TEST(DeserializeJsonFromFile, EmptyJsonObject) {
|
| ScopedTempFile temp;
|
| - EXPECT_EQ(strlen(kEmptyJsonString), temp.Write(kEmptyJsonString));
|
| - scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.file());
|
| + EXPECT_EQ(static_cast<int>(strlen(kEmptyJsonString)),
|
| + temp.Write(kEmptyJsonString));
|
| + scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.path());
|
| EXPECT_NE(nullptr, value.get());
|
| }
|
|
|
| TEST(DeserializeJsonFromFile, ProperJsonObject) {
|
| ScopedTempFile temp;
|
| - EXPECT_EQ(strlen(kProperJsonString), temp.Write(kProperJsonString));
|
| - scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.file());
|
| + EXPECT_EQ(static_cast<int>(strlen(kProperJsonString)),
|
| + temp.Write(kProperJsonString));
|
| + scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.path());
|
| EXPECT_NE(nullptr, value.get());
|
| }
|
|
|
| TEST(DeserializeJsonFromFile, PoorlyFormedJsonObject) {
|
| ScopedTempFile temp;
|
| - EXPECT_EQ(strlen(kPoorlyFormedJsonString),
|
| + EXPECT_EQ(static_cast<int>(strlen(kPoorlyFormedJsonString)),
|
| temp.Write(kPoorlyFormedJsonString));
|
| - scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.file());
|
| + scoped_ptr<base::Value> value = DeserializeJsonFromFile(temp.path());
|
| EXPECT_EQ(nullptr, value.get());
|
| }
|
|
|
| @@ -150,7 +117,7 @@ TEST(SerializeJsonToFile, BadValue) {
|
| ScopedTempFile temp;
|
|
|
| base::BinaryValue value(scoped_ptr<char[]>(new char[12]), 12);
|
| - ASSERT_FALSE(SerializeJsonToFile(temp.file(), value));
|
| + ASSERT_FALSE(SerializeJsonToFile(temp.path(), value));
|
| std::string str(temp.Read());
|
| EXPECT_TRUE(str.empty());
|
| }
|
| @@ -159,7 +126,7 @@ TEST(SerializeJsonToFile, EmptyValue) {
|
| ScopedTempFile temp;
|
|
|
| base::DictionaryValue value;
|
| - ASSERT_TRUE(SerializeJsonToFile(temp.file(), value));
|
| + ASSERT_TRUE(SerializeJsonToFile(temp.path(), value));
|
| std::string str(temp.Read());
|
| ASSERT_FALSE(str.empty());
|
| EXPECT_EQ(kEmptyJsonFileString, str);
|
| @@ -170,11 +137,11 @@ TEST(SerializeJsonToFile, PopulatedValue) {
|
|
|
| base::DictionaryValue orig_value;
|
| orig_value.SetString(kTestKey, kTestValue);
|
| - ASSERT_TRUE(SerializeJsonToFile(temp.file(), orig_value));
|
| + ASSERT_TRUE(SerializeJsonToFile(temp.path(), orig_value));
|
| std::string str(temp.Read());
|
| ASSERT_FALSE(str.empty());
|
|
|
| - scoped_ptr<base::Value> new_value = DeserializeJsonFromFile(temp.file());
|
| + scoped_ptr<base::Value> new_value = DeserializeJsonFromFile(temp.path());
|
| ASSERT_NE(nullptr, new_value.get());
|
| EXPECT_TRUE(new_value->Equals(&orig_value));
|
| }
|
|
|