generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webm2pes: Fix tests.

Browse Source 
Abuse of vector::capacity and vector::reserve in combination with
abuse of vector::operator[] was a bad idea.

Change-Id: Id7bdb71888b9d0d174f5243f8cf2771d181888be
This commit is contained in:
Tom Finegan
2016-02-09 20:05:32 -08:00
parent 41a9147f2a
commit 8c8cba6af6
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
testing/webm2pes_tests.cc
View File

@@ -93,23 +93,28 @@ class Webm2PesTests : public ::testing::Test {
Webm2PesTests() : read_pos_(0), parse_state_(kParsePesHeader) {} Webm2PesTests() : read_pos_(0), parse_state_(kParsePesHeader) {}
bool CreateAndLoadTestInput() { void CreateAndLoadTestInput() {
libwebm::Webm2Pes converter(input_file_name_, temp_file_name_.name()); libwebm::Webm2Pes converter(input_file_name_, temp_file_name_.name());
EXPECT_TRUE(converter.ConvertToFile()); ASSERT_TRUE(converter.ConvertToFile());
pes_file_size_ = libwebm::test::GetFileSize(pes_file_name()); pes_file_size_ = libwebm::test::GetFileSize(pes_file_name());
EXPECT_GT(pes_file_size_, 0); ASSERT_GT(pes_file_size_, 0);
pes_file_data_.reserve(pes_file_size_); pes_file_data_.reserve(pes_file_size_);
EXPECT_EQ(pes_file_size_, pes_file_data_.capacity());
libwebm::FilePtr file = libwebm::FilePtr( libwebm::FilePtr file = libwebm::FilePtr(
std::fopen(pes_file_name().c_str(), "rb"), libwebm::FILEDeleter()); std::fopen(pes_file_name().c_str(), "rb"), libwebm::FILEDeleter());
EXPECT_EQ(std::fread(&pes_file_data_[0], 1, pes_file_size_, file.get()),
pes_file_size_); int byte;
while ((byte = fgetc(file.get())) != EOF)
pes_file_data_.push_back(static_cast<std::uint8_t>(byte));
ASSERT_TRUE(feof(file.get()) && !ferror(file.get()));
ASSERT_EQ(pes_file_size_, pes_file_data_.size());
read_pos_ = 0; read_pos_ = 0;
parse_state_ = kParsePesHeader; parse_state_ = kParsePesHeader;
return true;
} }
bool VerifyPacketStartCode() { bool VerifyPacketStartCode() {
EXPECT_LT(read_pos_ + 2, pes_file_data_.size());
// PES packets all start with the byte sequence 0x0 0x0 0x1. // PES packets all start with the byte sequence 0x0 0x0 0x1.
if (pes_file_data_[read_pos_] != 0 || pes_file_data_[read_pos_ + 1] != 0 || if (pes_file_data_[read_pos_] != 0 || pes_file_data_[read_pos_ + 1] != 0 ||
pes_file_data_[read_pos_ + 2] != 1) { pes_file_data_[read_pos_ + 2] != 1) {
@@ -118,9 +123,13 @@ class Webm2PesTests : public ::testing::Test {
return true; return true;
} }
std::uint8_t ReadStreamId() { return pes_file_data_[read_pos_ + 3]; } std::uint8_t ReadStreamId() {
EXPECT_LT(read_pos_ + 3, pes_file_data_.size());
return pes_file_data_[read_pos_ + 3]; }
std::uint16_t ReadPacketLength() { std::uint16_t ReadPacketLength() {
EXPECT_LT(read_pos_ + 5, pes_file_data_.size());
// Read and byte swap 16 bit big endian length. // Read and byte swap 16 bit big endian length.
return (pes_file_data_[read_pos_ + 4] << 8) | pes_file_data_[read_pos_ + 5]; return (pes_file_data_[read_pos_ + 4] << 8) | pes_file_data_[read_pos_ + 5];
} }
@@ -245,12 +254,10 @@ class Webm2PesTests : public ::testing::Test {
ParseState parse_state_; ParseState parse_state_;
}; };
TEST_F(Webm2PesTests, CreatePesFile) { TEST_F(Webm2PesTests, CreatePesFile) { CreateAndLoadTestInput(); }
ASSERT_TRUE(CreateAndLoadTestInput());
}
TEST_F(Webm2PesTests, CanParseFirstPacket) { TEST_F(Webm2PesTests, CanParseFirstPacket) {
ASSERT_TRUE(CreateAndLoadTestInput()); CreateAndLoadTestInput();
// //
// Parse the PES Header. // Parse the PES Header.