Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change LocalFileTest to use CreateTemporaryFile 

- The tests couldn't run in parallel using gtest-parallel
  (https://github.com/google/gtest-parallel) because all the tests
  used the same file.

Change-Id: I9a3d2c20c290fbf4bee2a1d79c4ce9bf802aefcf
This commit is contained in:
Rintaro Kuroiwa 2015-07-22 00:23:11 -07:00
parent 60c54975d7
commit 8d84ebfed7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packager/media/file/file_unittest.cc
View File

@ -11,7 +11,6 @@
namespace { namespace {
const int kDataSize = 1024; const int kDataSize = 1024;
const char* kTestLocalFileName = "/tmp/local_file_test";
} }
namespace edash_packager { namespace edash_packager {
@ -25,26 +24,33 @@ class LocalFileTest : public testing::Test {
data_[i] = i % 256; data_[i] = i % 256;
// Test file path for file_util API. // Test file path for file_util API.
test_file_path_ = base::FilePath(kTestLocalFileName); ASSERT_TRUE(base::CreateTemporaryFile(&test_file_path_));
local_file_name_no_prefix_ = test_file_path_.value();
// Local file name with prefix for File API. // Local file name with prefix for File API.
local_file_name_ = kLocalFilePrefix; local_file_name_ = kLocalFilePrefix;
local_file_name_ += kTestLocalFileName; local_file_name_ += local_file_name_no_prefix_;
} }
virtual void TearDown() { virtual void TearDown() {
// Remove test file if created. // Remove test file if created.
base::DeleteFile(base::FilePath(kTestLocalFileName), false); base::DeleteFile(base::FilePath(local_file_name_no_prefix_), false);
} }
std::string data_; std::string data_;
// Path to the temporary file for this test.
base::FilePath test_file_path_; base::FilePath test_file_path_;
// Same as |test_file_path_| but in string form.
std::string local_file_name_no_prefix_;
// Same as |local_file_name_no_prefix_| but with the file prefix.
std::string local_file_name_; std::string local_file_name_;
}; };
TEST_F(LocalFileTest, ReadNotExist) { TEST_F(LocalFileTest, ReadNotExist) {
// Remove test file if it exists. // Remove test file if it exists.
base::DeleteFile(base::FilePath(kTestLocalFileName), false); base::DeleteFile(base::FilePath(local_file_name_no_prefix_), false);
ASSERT_TRUE(File::Open(local_file_name_.c_str(), "r") == NULL); ASSERT_TRUE(File::Open(local_file_name_.c_str(), "r") == NULL);
} }
@ -99,7 +105,7 @@ TEST_F(LocalFileTest, Read_And_Eof) {
TEST_F(LocalFileTest, WriteRead) { TEST_F(LocalFileTest, WriteRead) {
// Write file using File API, using file name directly (without prefix). // Write file using File API, using file name directly (without prefix).
File* file = File::Open(kTestLocalFileName, "w"); File* file = File::Open(local_file_name_no_prefix_.c_str(), "w");
ASSERT_TRUE(file != NULL); ASSERT_TRUE(file != NULL);
EXPECT_EQ(kDataSize, file->Write(&data_[0], kDataSize)); EXPECT_EQ(kDataSize, file->Write(&data_[0], kDataSize));
EXPECT_EQ(kDataSize, file->Size()); EXPECT_EQ(kDataSize, file->Size());