zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete GetExecutablePath and related unused code.

Browse Source 
The function GetExecutablePath is a hack with poor portability. Delete
it and its caller GetTestFilePath. The latter was used in
videoframe_unittest.h, where it is replaced by
webrtc::test::ResourcePath.

Delete unused functions declared in base/testutils.h: ReadFile,
GetSiblingDirectory, GetGoogle3Directory, GetTalkDirectory,
CmpHelperFileEq, EXPECT_FILEEQ, ASSERT_FILEEQ.

Delete unused functions declared in media/base/testutils.h:
GetTestFilePath (see above), LoadPlanarYuvTestImage,
DumpPlanarYuvTestImage, ComputePSNR, ComputeSumSquareError.

The functions LoadPlanarYuvTestImage, DumpPlanarYuvTestImage were used
in yuvscaler_unittests.cc and planarfunctions_unittests.cc, under
webrtc/pc. However, these tests are never compiled or run, and appear
not to have been for the last few years, and are therefore deleted
rather than updated. It might make sense to check if libyuv have
comparable tests, and if not, resurrect them as part of libyuv
unittests.

BUG=
R=perkj@webrtc.org

Review URL: https://codereview.webrtc.org/2058043002 .

Cr-Commit-Position: refs/heads/master@{#13163}
This commit is contained in:
Niels Möller
2016-06-16 12:44:30 +02:00
parent 342f74005f
commit b00dc386d3
12 changed files with 74 additions and 1829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
webrtc/base/testutils.h
View File

@ -419,49 +419,6 @@ class SocketTestServer : public sigslot::has_slots<> {
std::vector<SocketTestClient*> clients_;
};
///////////////////////////////////////////////////////////////////////////////
// Generic Utilities
///////////////////////////////////////////////////////////////////////////////
inline bool ReadFile(const char* filename, std::string* contents) {
FILE* fp = fopen(filename, "rb");
if (!fp)
return false;
char buffer[1024*64];
size_t read;
contents->clear();
while ((read = fread(buffer, 1, sizeof(buffer), fp))) {
contents->append(buffer, read);
}
bool success = (0 != feof(fp));
fclose(fp);
return success;
}
// Look in parent dir for parallel directory.
inline rtc::Pathname GetSiblingDirectory(
const std::string& parallel_dir) {
rtc::Pathname path = rtc::Filesystem::GetCurrentDirectory();
while (!path.empty()) {
rtc::Pathname potential_parallel_dir = path;
potential_parallel_dir.AppendFolder(parallel_dir);
if (rtc::Filesystem::IsFolder(potential_parallel_dir)) {
return potential_parallel_dir;
}
path.SetFolder(path.parent_folder());
}
return path;
}
inline rtc::Pathname GetGoogle3Directory() {
return GetSiblingDirectory("google3");
}
inline rtc::Pathname GetTalkDirectory() {
return GetSiblingDirectory("talk");
}
///////////////////////////////////////////////////////////////////////////////
// Unittest predicates which are similar to STREQ, but for raw memory
///////////////////////////////////////////////////////////////////////////////
@ -504,25 +461,6 @@ inline AssertionResult CmpHelperMemEq(const char* expected_expression,
return AssertionFailure(msg);
}
inline AssertionResult CmpHelperFileEq(const char* expected_expression,
const char* expected_length_expression,
const char* actual_filename,
const void* expected,
size_t expected_length,
const char* filename)
{
std::string contents;
if (!ReadFile(filename, &contents)) {
Message msg;
msg << "File '" << filename << "' could not be read.";
return AssertionFailure(msg);
}
return CmpHelperMemEq(expected_expression, expected_length_expression,
actual_filename, "",
expected, expected_length,
contents.c_str(), contents.size());
}
#define EXPECT_MEMEQ(expected, expected_length, actual, actual_length) \
EXPECT_PRED_FORMAT4(::testing::CmpHelperMemEq, expected, expected_length, \
actual, actual_length)
@ -531,14 +469,6 @@ inline AssertionResult CmpHelperFileEq(const char* expected_expression,
ASSERT_PRED_FORMAT4(::testing::CmpHelperMemEq, expected, expected_length, \
actual, actual_length)
#define EXPECT_FILEEQ(expected, expected_length, filename) \
EXPECT_PRED_FORMAT3(::testing::CmpHelperFileEq, expected, expected_length, \
filename)
#define ASSERT_FILEEQ(expected, expected_length, filename) \
ASSERT_PRED_FORMAT3(::testing::CmpHelperFileEq, expected, expected_length, \
filename)
///////////////////////////////////////////////////////////////////////////////
// Helpers for initializing constant memory with integers in a particular byte
// order