Splitted FileHandler into FrameReader and FrameWriter classes and moved them to testsupport in test.gyp.
Fixed unit tests so they don't use ASSERT_DEATH since that doesn't work with Valgrind. Fixed all Valgrind warnings except the one caused by CriticalSectionWrapper in system_wrappers. Reworked all includes and GYP include paths to use full directory paths. Removed util.h for logging, since it rendered warnings in Valgrind because of gflags. Replaced it with a verbose flag and a new function in video_quality_measurement.cc BUG= TEST=Passed test_support_unittests and video_codecs_test_framework_unittests on Linux, Mac and Windows. Review URL: http://webrtc-codereview.appspot.com/311001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1126 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
59
test/testsupport/unittest_utils.h
Normal file
59
test/testsupport/unittest_utils.h
Normal file
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
|
||||
#define WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
|
||||
|
||||
namespace webrtc {
|
||||
namespace test {
|
||||
|
||||
const int kPacketSizeInBytes = 1500;
|
||||
const int kPacketDataLength = kPacketSizeInBytes * 2 + 1;
|
||||
const int kPacketDataNumberOfPackets = 3;
|
||||
|
||||
// A base test fixture for packet related tests. Contains
|
||||
// two full prepared packets with 1s, 2s in their data and a third packet with
|
||||
// a single 3 in it (size=1).
|
||||
// A packet data structure is also available, that contains these three packets
|
||||
// in order.
|
||||
class PacketRelatedTest: public testing::Test {
|
||||
protected:
|
||||
// Tree packet byte arrays with data used for verification:
|
||||
WebRtc_UWord8 packet1_[kPacketSizeInBytes];
|
||||
WebRtc_UWord8 packet2_[kPacketSizeInBytes];
|
||||
WebRtc_UWord8 packet3_[1];
|
||||
// Construct a data structure containing these packets
|
||||
WebRtc_UWord8 packet_data_[kPacketDataLength];
|
||||
WebRtc_UWord8* packet_data_pointer_;
|
||||
|
||||
PacketRelatedTest() {
|
||||
packet_data_pointer_ = packet_data_;
|
||||
|
||||
memset(packet1_, 1, kPacketSizeInBytes);
|
||||
memset(packet2_, 2, kPacketSizeInBytes);
|
||||
memset(packet3_, 3, 1);
|
||||
// Fill the packet_data:
|
||||
memcpy(packet_data_pointer_, packet1_, kPacketSizeInBytes);
|
||||
memcpy(packet_data_pointer_ + kPacketSizeInBytes, packet2_,
|
||||
kPacketSizeInBytes);
|
||||
memcpy(packet_data_pointer_ + kPacketSizeInBytes * 2, packet3_, 1);
|
||||
}
|
||||
virtual ~PacketRelatedTest() {}
|
||||
void SetUp() {
|
||||
// Initialize the random generator with 0 to get deterministic behavior
|
||||
srand(0);
|
||||
}
|
||||
void TearDown() {}
|
||||
};
|
||||
|
||||
} // namespace test
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
|
||||
Reference in New Issue
Block a user