Revert "Merge latest oemcrypto-v17 change"
This reverts commit 642965c678.
Reason for revert: Droidfood Blocking Bug: 217145027
Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806
This commit is contained in:
Daniel Chapin
committed by
Android Build Coastguard Worker
Android Build Coastguard Worker
parent
1397b61f87
commit
d69b488be1
@@ -2,15 +2,14 @@
|
||||
// source code may only be used and distributed under the Widevine License
|
||||
// Agreement.
|
||||
|
||||
#include "file_store.h"
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "cdm_random.h"
|
||||
#include "file_store.h"
|
||||
#include "test_vectors.h"
|
||||
|
||||
namespace wvutil {
|
||||
namespace wvcdm {
|
||||
|
||||
namespace {
|
||||
const std::string kTestDirName = "test_dir";
|
||||
@@ -32,26 +31,26 @@ class FileTest : public testing::Test {
|
||||
void TearDown() override { RemoveTestDir(); }
|
||||
|
||||
void RemoveTestDir() {
|
||||
EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
|
||||
EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
|
||||
}
|
||||
|
||||
FileSystem file_system_;
|
||||
};
|
||||
|
||||
TEST_F(FileTest, FileExists) {
|
||||
EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kExistentFile));
|
||||
EXPECT_TRUE(file_system_.Exists(wvcdm::test_vectors::kExistentDir));
|
||||
EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kNonExistentFile));
|
||||
EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kNonExistentDir));
|
||||
EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentFile));
|
||||
EXPECT_TRUE(file_system_.Exists(test_vectors::kExistentDir));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentFile));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kNonExistentDir));
|
||||
}
|
||||
|
||||
TEST_F(FileTest, RemoveDir) {
|
||||
EXPECT_TRUE(file_system_.Remove(wvcdm::test_vectors::kTestDir));
|
||||
EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
|
||||
EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
|
||||
}
|
||||
|
||||
TEST_F(FileTest, OpenFile) {
|
||||
std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path = test_vectors::kTestDir + kTestFileName;
|
||||
EXPECT_TRUE(file_system_.Remove(path));
|
||||
|
||||
std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
|
||||
@@ -61,7 +60,7 @@ TEST_F(FileTest, OpenFile) {
|
||||
}
|
||||
|
||||
TEST_F(FileTest, RemoveDirAndFile) {
|
||||
std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path = test_vectors::kTestDir + kTestFileName;
|
||||
|
||||
std::unique_ptr<File> file = file_system_.Open(path, FileSystem::kCreate);
|
||||
ASSERT_TRUE(file);
|
||||
@@ -75,15 +74,15 @@ TEST_F(FileTest, RemoveDirAndFile) {
|
||||
|
||||
EXPECT_TRUE(file_system_.Exists(path));
|
||||
RemoveTestDir();
|
||||
EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir));
|
||||
EXPECT_FALSE(file_system_.Exists(path));
|
||||
}
|
||||
|
||||
TEST_F(FileTest, RemoveWildcardFiles) {
|
||||
std::string path1 = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path2 = wvcdm::test_vectors::kTestDir + kTestFileName2;
|
||||
std::string path1 = test_vectors::kTestDir + kTestFileName;
|
||||
std::string path2 = test_vectors::kTestDir + kTestFileName2;
|
||||
std::string wildcard_path =
|
||||
wvcdm::test_vectors::kTestDir + kWildcard + kTestFileNameExt;
|
||||
test_vectors::kTestDir + kWildcard + kTestFileNameExt;
|
||||
|
||||
std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
|
||||
ASSERT_TRUE(file);
|
||||
@@ -98,7 +97,7 @@ TEST_F(FileTest, RemoveWildcardFiles) {
|
||||
}
|
||||
|
||||
TEST_F(FileTest, FileSize) {
|
||||
std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path = test_vectors::kTestDir + kTestFileName;
|
||||
file_system_.Remove(path);
|
||||
|
||||
std::string write_data = CdmRandom::RandomData(600);
|
||||
@@ -112,7 +111,7 @@ TEST_F(FileTest, FileSize) {
|
||||
}
|
||||
|
||||
TEST_F(FileTest, WriteReadBinaryFile) {
|
||||
std::string path = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path = test_vectors::kTestDir + kTestFileName;
|
||||
file_system_.Remove(path);
|
||||
|
||||
std::string write_data = CdmRandom::RandomData(600);
|
||||
@@ -135,10 +134,10 @@ TEST_F(FileTest, ListFiles) {
|
||||
std::vector<std::string> names;
|
||||
|
||||
std::string not_path("zzz");
|
||||
std::string path1 = wvcdm::test_vectors::kTestDir + kTestFileName;
|
||||
std::string path2 = wvcdm::test_vectors::kTestDir + kTestFileName2;
|
||||
std::string path3 = wvcdm::test_vectors::kTestDir + kTestFileName3;
|
||||
std::string path_dir = wvcdm::test_vectors::kTestDir;
|
||||
std::string path1 = test_vectors::kTestDir + kTestFileName;
|
||||
std::string path2 = test_vectors::kTestDir + kTestFileName2;
|
||||
std::string path3 = test_vectors::kTestDir + kTestFileName3;
|
||||
std::string path_dir = test_vectors::kTestDir;
|
||||
|
||||
std::unique_ptr<File> file = file_system_.Open(path1, FileSystem::kCreate);
|
||||
ASSERT_TRUE(file);
|
||||
@@ -182,7 +181,7 @@ TEST_F(FileTest, ListFiles) {
|
||||
TEST_F(FileTest, CreateGlobalCertificates) {
|
||||
// Clear directory
|
||||
std::vector<std::string> names;
|
||||
std::string path_dir = wvcdm::test_vectors::kTestDir;
|
||||
std::string path_dir = test_vectors::kTestDir;
|
||||
std::string wild_card_path = path_dir + kWildcard;
|
||||
file_system_.Remove(wild_card_path);
|
||||
if (file_system_.List(path_dir, &names)) {
|
||||
@@ -190,10 +189,9 @@ TEST_F(FileTest, CreateGlobalCertificates) {
|
||||
}
|
||||
|
||||
// Create certificates and verify that they exist
|
||||
std::string certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string legacy_certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
|
||||
std::unique_ptr<File> file =
|
||||
file_system_.Open(certificate_path, FileSystem::kCreate);
|
||||
@@ -216,17 +214,16 @@ TEST_F(FileTest, CreateGlobalCertificates) {
|
||||
TEST_F(FileTest, CreateCertificates) {
|
||||
// Clear directory
|
||||
std::vector<std::string> names;
|
||||
std::string path_dir = wvcdm::test_vectors::kTestDir;
|
||||
std::string path_dir = test_vectors::kTestDir;
|
||||
std::string wild_card_path = path_dir + kWildcard;
|
||||
file_system_.Remove(wild_card_path);
|
||||
if (file_system_.List(path_dir, &names)) {
|
||||
EXPECT_EQ(0u, names.size());
|
||||
}
|
||||
|
||||
std::string certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string legacy_certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
|
||||
// Create Global certificates
|
||||
std::unique_ptr<File> file =
|
||||
@@ -288,17 +285,16 @@ TEST_F(FileTest, CreateCertificates) {
|
||||
TEST_F(FileTest, RemoveCertificates) {
|
||||
// Clear directory
|
||||
std::vector<std::string> names;
|
||||
std::string path_dir = wvcdm::test_vectors::kTestDir;
|
||||
std::string path_dir = test_vectors::kTestDir;
|
||||
std::string wild_card_path = path_dir + kWildcard;
|
||||
file_system_.Remove(wild_card_path);
|
||||
if (file_system_.List(path_dir, &names)) {
|
||||
EXPECT_EQ(0u, names.size());
|
||||
}
|
||||
|
||||
std::string certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string certificate_path = test_vectors::kTestDir + kCertificateFileName;
|
||||
std::string legacy_certificate_path =
|
||||
wvcdm::test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
test_vectors::kTestDir + kLegacyCertificateFileName;
|
||||
|
||||
// Create Global certificates
|
||||
std::unique_ptr<File> file =
|
||||
@@ -334,34 +330,30 @@ TEST_F(FileTest, RemoveCertificates) {
|
||||
// Remove all even number listed files
|
||||
for (size_t i = 0; i < names.size(); ++i) {
|
||||
if (i % 2 == 0) {
|
||||
EXPECT_TRUE(
|
||||
file_system_.Remove(wvcdm::test_vectors::kTestDir + names[i]));
|
||||
EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir + names[i]));
|
||||
}
|
||||
}
|
||||
|
||||
// Verify that they have been removed
|
||||
for (size_t i = 0; i < names.size(); ++i) {
|
||||
if (i % 2 == 1) {
|
||||
EXPECT_TRUE(
|
||||
file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
|
||||
EXPECT_TRUE(file_system_.Exists(test_vectors::kTestDir + names[i]));
|
||||
} else {
|
||||
EXPECT_FALSE(
|
||||
file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir + names[i]));
|
||||
}
|
||||
}
|
||||
|
||||
// Remove all odd number listed files
|
||||
for (size_t i = 0; i < names.size(); ++i) {
|
||||
if (i % 2 == 1) {
|
||||
EXPECT_TRUE(
|
||||
file_system_.Remove(wvcdm::test_vectors::kTestDir + names[i]));
|
||||
EXPECT_TRUE(file_system_.Remove(test_vectors::kTestDir + names[i]));
|
||||
}
|
||||
}
|
||||
|
||||
// Verify that all have been removed
|
||||
for (size_t i = 0; i < names.size(); ++i) {
|
||||
EXPECT_FALSE(file_system_.Exists(wvcdm::test_vectors::kTestDir + names[i]));
|
||||
EXPECT_FALSE(file_system_.Exists(test_vectors::kTestDir + names[i]));
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace wvutil
|
||||
} // namespace wvcdm
|
||||
|
||||
Reference in New Issue
Block a user