widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct test data member name

Browse Source 
[ Merge of http://go/wvgerrit/119645 ]

Bug: 169740403
Test: WV unit/integration tests
Change-Id: I2a3e82869e3a45112e8b15eea4ac668980c3eb4d
This commit is contained in:
Rahul Frias
2021-03-06 13:02:58 -08:00
parent dbb1671e39
commit edf9ad5b90
2 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
libwvdrmengine/cdm/util/test/file_store_unittest.cpp
View File

@@ -28,51 +28,51 @@ class FileTest : public testing::Test {
void TearDown() override { RemoveTestDir(); } void TearDown() override { RemoveTestDir(); }
void RemoveTestDir() { void RemoveTestDir() {
EXPECT_TRUE(file_system.Remove(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
} }
FileSystem file_system; FileSystem file_system_;
}; };
TEST_F(FileTest, FileExists) { TEST_F(FileTest, FileExists) {
EXPECT_TRUE(file_system.Exists(test_vectors::kExistentFile)); EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentFile));
EXPECT_TRUE(file_system.Exists(test_vectors::kExistentDir)); EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentDir));
EXPECT_FALSE(file_system.Exists(test_vectors::kNonExistentFile)); EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentFile));
EXPECT_FALSE(file_system.Exists(test_vectors::kNonExistentDir)); EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentDir));
} }
TEST_F(FileTest, RemoveDir) { TEST_F(FileTest, RemoveDir) {
EXPECT_TRUE(file_system.Remove(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
EXPECT_FALSE(file_system.Exists(test_vectors::kTestDir)); EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
} }
TEST_F(FileTest, OpenFile) { TEST_F(FileTest, OpenFile) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
EXPECT_TRUE(file_system.Remove(path)); EXPECT_TRUE(file_system_.Remove(path));
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
} }
TEST_F(FileTest, RemoveDirAndFile) { TEST_F(FileTest, RemoveDirAndFile) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
EXPECT_TRUE(file_system.Remove(path)); EXPECT_TRUE(file_system_.Remove(path));
EXPECT_FALSE(file_system.Exists(path)); EXPECT_FALSE(file_system_.Exists(path));
file = file_system.Open(path, FileSystem::kCreate); file = file_system_.Open(path, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
RemoveTestDir(); RemoveTestDir();
EXPECT_FALSE(file_system.Exists(test_vectors::kTestDir)); EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
EXPECT_FALSE(file_system.Exists(path)); EXPECT_FALSE(file_system_.Exists(path));
} }
TEST_F(FileTest, RemoveWildcardFiles) { TEST_F(FileTest, RemoveWildcardFiles) {
@@ -81,47 +81,47 @@ TEST_F(FileTest, RemoveWildcardFiles) {
std::string wildcard_path = std::string wildcard_path =
test_vectors::kTestDir + kWildcard + kTestFileNameExt; test_vectors::kTestDir + kWildcard + kTestFileNameExt;
std::unique_ptr<File> file = file_system.Open(path1, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
file = file_system.Open(path2, FileSystem::kCreate); file = file_system_.Open(path2, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path1)); EXPECT_TRUE(file_system_.Exists(path1));
EXPECT_TRUE(file_system.Exists(path2)); EXPECT_TRUE(file_system_.Exists(path2));
EXPECT_TRUE(file_system.Remove(wildcard_path)); EXPECT_TRUE(file_system_.Remove(wildcard_path));
EXPECT_FALSE(file_system.Exists(path1)); EXPECT_FALSE(file_system_.Exists(path1));
EXPECT_FALSE(file_system.Exists(path2)); EXPECT_FALSE(file_system_.Exists(path2));
} }
TEST_F(FileTest, FileSize) { TEST_F(FileTest, FileSize) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
file_system.Remove(path); file_system_.Remove(path);
std::string write_data = CdmRandom::RandomData(600); std::string write_data = CdmRandom::RandomData(600);
size_t write_data_size = write_data.size(); size_t write_data_size = write_data.size();
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size); EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
EXPECT_EQ(static_cast<ssize_t>(write_data_size), file_system.FileSize(path)); EXPECT_EQ(static_cast<ssize_t>(write_data_size), file_system_.FileSize(path));
} }
TEST_F(FileTest, WriteReadBinaryFile) { TEST_F(FileTest, WriteReadBinaryFile) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
file_system.Remove(path); file_system_.Remove(path);
std::string write_data = CdmRandom::RandomData(600); std::string write_data = CdmRandom::RandomData(600);
size_t write_data_size = write_data.size(); size_t write_data_size = write_data.size();
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size); EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
std::string read_data; std::string read_data;
read_data.resize(file_system.FileSize(path)); read_data.resize(file_system_.FileSize(path));
size_t read_data_size = read_data.size(); size_t read_data_size = read_data.size();
file = file_system.Open(path, FileSystem::kReadOnly); file = file_system_.Open(path, FileSystem::kReadOnly);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_EQ(file->Read(&read_data[0], read_data_size), read_data_size); EXPECT_EQ(file->Read(&read_data[0], read_data_size), read_data_size);
EXPECT_EQ(write_data, read_data); EXPECT_EQ(write_data, read_data);
@@ -136,25 +136,25 @@ TEST_F(FileTest, ListFiles) {
std::string path3 = test_vectors::kTestDir + kTestFileName3; std::string path3 = test_vectors::kTestDir + kTestFileName3;
std::string path_dir = test_vectors::kTestDir; std::string path_dir = test_vectors::kTestDir;
std::unique_ptr<File> file = file_system.Open(path1, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
file = file_system.Open(path2, FileSystem::kCreate); file = file_system_.Open(path2, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
file = file_system.Open(path3, FileSystem::kCreate); file = file_system_.Open(path3, FileSystem::kCreate);
ASSERT_TRUE(file); ASSERT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path1)); EXPECT_TRUE(file_system_.Exists(path1));
EXPECT_TRUE(file_system.Exists(path2)); EXPECT_TRUE(file_system_.Exists(path2));
EXPECT_TRUE(file_system.Exists(path3)); EXPECT_TRUE(file_system_.Exists(path3));
// Ask for non-existent path. // Ask for non-existent path.
EXPECT_FALSE(file_system.List(not_path, &names)); EXPECT_FALSE(file_system_.List(not_path, &names));
// Valid path, but no way to return names. // Valid path, but no way to return names.
EXPECT_FALSE(file_system.List(path_dir, nullptr)); EXPECT_FALSE(file_system_.List(path_dir, nullptr));
// Valid path, valid return. // Valid path, valid return.
EXPECT_TRUE(file_system.List(path_dir, &names)); EXPECT_TRUE(file_system_.List(path_dir, &names));
// Should find three files. Order not important. // Should find three files. Order not important.
EXPECT_EQ(3u, names.size()); EXPECT_EQ(3u, names.size());
@@ -162,15 +162,15 @@ TEST_F(FileTest, ListFiles) {
kTestFileName, kTestFileName2, kTestFileName3)); kTestFileName, kTestFileName2, kTestFileName3));
std::string wild_card_path = path_dir + kWildcard + kTestFileNameExt; std::string wild_card_path = path_dir + kWildcard + kTestFileNameExt;
EXPECT_TRUE(file_system.Remove(wild_card_path)); EXPECT_TRUE(file_system_.Remove(wild_card_path));
EXPECT_TRUE(file_system.List(path_dir, &names)); EXPECT_TRUE(file_system_.List(path_dir, &names));
EXPECT_EQ(1u, names.size()); EXPECT_EQ(1u, names.size());
EXPECT_TRUE(names[0].compare(kTestFileName3) == 0); EXPECT_TRUE(names[0].compare(kTestFileName3) == 0);
std::string wild_card_path2 = path_dir + kWildcard + kTestFileNameExt3; std::string wild_card_path2 = path_dir + kWildcard + kTestFileNameExt3;
EXPECT_TRUE(file_system.Remove(wild_card_path2)); EXPECT_TRUE(file_system_.Remove(wild_card_path2));
EXPECT_TRUE(file_system.List(path_dir, &names)); EXPECT_TRUE(file_system_.List(path_dir, &names));
EXPECT_EQ(0u, names.size()); EXPECT_EQ(0u, names.size());
} }

60
libwvdrmengine/cdm/util/test/file_utils_unittest.cpp
View File

@@ -31,24 +31,24 @@ class FileUtilsTest : public testing::Test {
virtual void TearDown() { RemoveTestDir(); } virtual void TearDown() { RemoveTestDir(); }
void CreateTestDir() { void CreateTestDir() {
if (!file_system.Exists(test_vectors::kTestDir)) { if (!file_system_.Exists(test_vectors::kTestDir)) {
EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir)); EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir));
} }
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
} }
void RemoveTestDir() { void RemoveTestDir() {
EXPECT_TRUE(file_system.Remove(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
} }
void CreateTestFile(const std::string file_path) { void CreateTestFile(const std::string file_path) {
std::string write_data = GenerateRandomData(600); std::string write_data = GenerateRandomData(600);
size_t write_data_size = write_data.size(); size_t write_data_size = write_data.size();
std::unique_ptr<File> file = std::unique_ptr<File> file =
file_system.Open(file_path, FileSystem::kCreate); file_system_.Open(file_path, FileSystem::kCreate);
EXPECT_TRUE(file); EXPECT_TRUE(file);
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size); EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(file_path)); EXPECT_TRUE(file_system_.Exists(file_path));
} }
std::string GenerateRandomData(uint32_t len) { std::string GenerateRandomData(uint32_t len) {
@@ -59,70 +59,70 @@ class FileUtilsTest : public testing::Test {
return data; return data;
} }
FileSystem file_system; FileSystem file_system_;
}; };
TEST_F(FileUtilsTest, CreateDirectory) { TEST_F(FileUtilsTest, CreateDirectory) {
std::string dir_wo_delimiter = std::string dir_wo_delimiter =
test_vectors::kTestDir.substr(0, test_vectors::kTestDir.size() - 1); test_vectors::kTestDir.substr(0, test_vectors::kTestDir.size() - 1);
if (file_system.Exists(dir_wo_delimiter)) if (file_system_.Exists(dir_wo_delimiter))
EXPECT_TRUE(file_system.Remove(dir_wo_delimiter)); EXPECT_TRUE(file_system_.Remove(dir_wo_delimiter));
EXPECT_FALSE(file_system.Exists(dir_wo_delimiter)); EXPECT_FALSE(file_system_.Exists(dir_wo_delimiter));
EXPECT_TRUE(FileUtils::CreateDirectory(dir_wo_delimiter)); EXPECT_TRUE(FileUtils::CreateDirectory(dir_wo_delimiter));
EXPECT_TRUE(file_system.Exists(dir_wo_delimiter)); EXPECT_TRUE(file_system_.Exists(dir_wo_delimiter));
EXPECT_TRUE(file_system.Remove(dir_wo_delimiter)); EXPECT_TRUE(file_system_.Remove(dir_wo_delimiter));
EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir)); EXPECT_TRUE(FileUtils::CreateDirectory(test_vectors::kTestDir));
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
EXPECT_TRUE(file_system.Remove(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
} }
TEST_F(FileUtilsTest, IsDir) { TEST_F(FileUtilsTest, IsDir) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file); EXPECT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
EXPECT_FALSE(FileUtils::IsDirectory(path)); EXPECT_FALSE(FileUtils::IsDirectory(path));
EXPECT_TRUE(FileUtils::IsDirectory(test_vectors::kTestDir)); EXPECT_TRUE(FileUtils::IsDirectory(test_vectors::kTestDir));
} }
TEST_F(FileUtilsTest, IsRegularFile) { TEST_F(FileUtilsTest, IsRegularFile) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file); EXPECT_TRUE(file);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
EXPECT_TRUE(file_system.Exists(test_vectors::kTestDir)); EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir));
EXPECT_TRUE(FileUtils::IsRegularFile(path)); EXPECT_TRUE(FileUtils::IsRegularFile(path));
EXPECT_FALSE(FileUtils::IsRegularFile(test_vectors::kTestDir)); EXPECT_FALSE(FileUtils::IsRegularFile(test_vectors::kTestDir));
} }
TEST_F(FileUtilsTest, CopyFile) { TEST_F(FileUtilsTest, CopyFile) {
std::string path = test_vectors::kTestDir + kTestFileName; std::string path = test_vectors::kTestDir + kTestFileName;
file_system.Remove(path); file_system_.Remove(path);
std::string write_data = GenerateRandomData(600); std::string write_data = GenerateRandomData(600);
size_t write_data_size = write_data.size(); size_t write_data_size = write_data.size();
std::unique_ptr<File> wr_file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> wr_file = file_system_.Open(path, FileSystem::kCreate);
EXPECT_TRUE(wr_file); EXPECT_TRUE(wr_file);
EXPECT_EQ(wr_file->Write(write_data.data(), write_data_size), EXPECT_EQ(wr_file->Write(write_data.data(), write_data_size),
write_data_size); write_data_size);
ASSERT_TRUE(file_system.Exists(path)); ASSERT_TRUE(file_system_.Exists(path));
std::string path_copy = test_vectors::kTestDir + kTestFileName2; std::string path_copy = test_vectors::kTestDir + kTestFileName2;
EXPECT_FALSE(file_system.Exists(path_copy)); EXPECT_FALSE(file_system_.Exists(path_copy));
EXPECT_TRUE(FileUtils::Copy(path, path_copy)); EXPECT_TRUE(FileUtils::Copy(path, path_copy));
std::string read_data; std::string read_data;
read_data.resize(file_system.FileSize(path_copy)); read_data.resize(file_system_.FileSize(path_copy));
size_t read_data_size = read_data.size(); size_t read_data_size = read_data.size();
std::unique_ptr<File> rd_file = std::unique_ptr<File> rd_file =
file_system.Open(path_copy, FileSystem::kReadOnly); file_system_.Open(path_copy, FileSystem::kReadOnly);
EXPECT_TRUE(rd_file); EXPECT_TRUE(rd_file);
EXPECT_EQ(rd_file->Read(&read_data[0], read_data_size), read_data_size); EXPECT_EQ(rd_file->Read(&read_data[0], read_data_size), read_data_size);
EXPECT_EQ(write_data, read_data); EXPECT_EQ(write_data, read_data);
EXPECT_EQ(file_system.FileSize(path), file_system.FileSize(path_copy)); EXPECT_EQ(file_system_.FileSize(path), file_system_.FileSize(path_copy));
} }
TEST_F(FileUtilsTest, ListEmptyDirectory) { TEST_F(FileUtilsTest, ListEmptyDirectory) {
@@ -138,18 +138,18 @@ TEST_F(FileUtilsTest, ListFiles) {
path = test_vectors::kTestDir + kTestFileName; path = test_vectors::kTestDir + kTestFileName;
std::string write_data = GenerateRandomData(600); std::string write_data = GenerateRandomData(600);
size_t write_data_size = write_data.size(); size_t write_data_size = write_data.size();
std::unique_ptr<File> file = file_system.Open(path, FileSystem::kCreate); std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file); EXPECT_TRUE(file);
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size); EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
path = test_vectors::kTestDir + kTestFileName2; path = test_vectors::kTestDir + kTestFileName2;
write_data = GenerateRandomData(600); write_data = GenerateRandomData(600);
write_data_size = write_data.size(); write_data_size = write_data.size();
file = file_system.Open(path, FileSystem::kCreate); file = file_system_.Open(path, FileSystem::kCreate);
EXPECT_TRUE(file); EXPECT_TRUE(file);
EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size); EXPECT_EQ(file->Write(write_data.data(), write_data_size), write_data_size);
EXPECT_TRUE(file_system.Exists(path)); EXPECT_TRUE(file_system_.Exists(path));
std::vector<std::string> files; std::vector<std::string> files;
EXPECT_TRUE(FileUtils::List(test_vectors::kTestDir, &files)); EXPECT_TRUE(FileUtils::List(test_vectors::kTestDir, &files));