Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev

Browse Source 
* commit 'b9095bacc3083610412757a50a2a1b4cea20f866':
  Clean up test allocations so real memory leaks are more visible
This commit is contained in:
Adam Lesinski
2014-08-29 19:56:56 +00:00
committed by Android Git Automerger
parent 5e71b3fa90 d06cd2b1bd
commit de99f4a234
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libs/androidfw/tests/BackupData_test.cpp
View File

@@ -45,7 +45,7 @@ namespace android {
class BackupDataTest : public testing::Test {
protected:
char* m_external_storage;
char* m_filename;
String8 mFilename;
String8 mKey1;
String8 mKey2;
String8 mKey3;
@@ -53,15 +53,13 @@ protected:
virtual void SetUp() {
m_external_storage = getenv("EXTERNAL_STORAGE");
mFilename.append(m_external_storage);
mFilename.append(TEST_FILENAME);
const int totalLen = strlen(m_external_storage) + strlen(TEST_FILENAME) + 1;
m_filename = new char[totalLen];
snprintf(m_filename, totalLen, "%s%s", m_external_storage, TEST_FILENAME);
::unlink(m_filename);
int fd = ::open(m_filename, O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
::unlink(mFilename.string());
int fd = ::open(mFilename.string(), O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (fd < 0) {
FAIL() << "Couldn't create " << m_filename << " for writing";
FAIL() << "Couldn't create " << mFilename.string() << " for writing";
}
mKey1 = String8(KEY1);
mKey2 = String8(KEY2);
@@ -74,7 +72,7 @@ protected:
};
TEST_F(BackupDataTest, WriteAndReadSingle) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
EXPECT_EQ(NO_ERROR, writer->WriteEntityHeader(mKey1, sizeof(DATA1)))
@@ -83,7 +81,7 @@ TEST_F(BackupDataTest, WriteAndReadSingle) {
<< "WriteEntityData returned an error";
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
EXPECT_EQ(NO_ERROR, reader->Status())
<< "Reader ctor failed";
@@ -116,7 +114,7 @@ TEST_F(BackupDataTest, WriteAndReadSingle) {
}
TEST_F(BackupDataTest, WriteAndReadMultiple) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, sizeof(DATA1));
writer->WriteEntityData(DATA1, sizeof(DATA1));
@@ -124,7 +122,7 @@ TEST_F(BackupDataTest, WriteAndReadMultiple) {
writer->WriteEntityData(DATA2, sizeof(DATA2));
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -164,7 +162,7 @@ TEST_F(BackupDataTest, WriteAndReadMultiple) {
}
TEST_F(BackupDataTest, SkipEntity) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, sizeof(DATA1));
writer->WriteEntityData(DATA1, sizeof(DATA1));
@@ -174,7 +172,7 @@ TEST_F(BackupDataTest, SkipEntity) {
writer->WriteEntityData(DATA3, sizeof(DATA3));
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -219,14 +217,14 @@ TEST_F(BackupDataTest, SkipEntity) {
}
TEST_F(BackupDataTest, DeleteEntity) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, sizeof(DATA1));
writer->WriteEntityData(DATA1, sizeof(DATA1));
writer->WriteEntityHeader(mKey2, -1);
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -258,7 +256,7 @@ TEST_F(BackupDataTest, DeleteEntity) {
}
TEST_F(BackupDataTest, EneityAfterDelete) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, sizeof(DATA1));
writer->WriteEntityData(DATA1, sizeof(DATA1));
@@ -267,7 +265,7 @@ TEST_F(BackupDataTest, EneityAfterDelete) {
writer->WriteEntityData(DATA3, sizeof(DATA3));
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -319,7 +317,7 @@ TEST_F(BackupDataTest, EneityAfterDelete) {
}
TEST_F(BackupDataTest, OnlyDeleteEntities) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, -1);
writer->WriteEntityHeader(mKey2, -1);
@@ -327,7 +325,7 @@ TEST_F(BackupDataTest, OnlyDeleteEntities) {
writer->WriteEntityHeader(mKey4, -1);
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -387,13 +385,13 @@ TEST_F(BackupDataTest, OnlyDeleteEntities) {
}
TEST_F(BackupDataTest, ReadDeletedEntityData) {
int fd = ::open(m_filename, O_WRONLY);
int fd = ::open(mFilename.string(), O_WRONLY);
BackupDataWriter* writer = new BackupDataWriter(fd);
writer->WriteEntityHeader(mKey1, -1);
writer->WriteEntityHeader(mKey2, -1);
::close(fd);
fd = ::open(m_filename, O_RDONLY);
fd = ::open(mFilename.string(), O_RDONLY);
BackupDataReader* reader = new BackupDataReader(fd);
bool done;
@@ -431,6 +429,7 @@ TEST_F(BackupDataTest, ReadDeletedEntityData) {
EXPECT_EQ(-1, (int) dataSize)
<< "not recognizing deletion on second entity";
delete[] dataBytes;
delete writer;
delete reader;
}

18
libs/androidfw/tests/ObbFile_test.cpp
View File

@@ -34,20 +34,18 @@ namespace android {
class ObbFileTest : public testing::Test {
protected:
sp<ObbFile> mObbFile;
char* mExternalStorage;
char* mFileName;
String8 mFileName;
virtual void SetUp() {
mObbFile = new ObbFile();
mExternalStorage = getenv("EXTERNAL_STORAGE");
char* externalStorage = getenv("EXTERNAL_STORAGE");
const int totalLen = strlen(mExternalStorage) + strlen(TEST_FILENAME) + 1;
mFileName = new char[totalLen];
snprintf(mFileName, totalLen, "%s%s", mExternalStorage, TEST_FILENAME);
mFileName.append(externalStorage);
mFileName.append(TEST_FILENAME);
int fd = ::open(mFileName, O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
int fd = ::open(mFileName.string(), O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
if (fd < 0) {
FAIL() << "Couldn't create " << mFileName << " for tests";
FAIL() << "Couldn't create " << mFileName.string() << " for tests";
}
}
@@ -71,12 +69,12 @@ TEST_F(ObbFileTest, WriteThenRead) {
EXPECT_TRUE(mObbFile->setSalt(salt, SALT_SIZE))
<< "Salt should be successfully set";
EXPECT_TRUE(mObbFile->writeTo(mFileName))
EXPECT_TRUE(mObbFile->writeTo(mFileName.string()))
<< "couldn't write to fake .obb file";
mObbFile = new ObbFile();
EXPECT_TRUE(mObbFile->readFrom(mFileName))
EXPECT_TRUE(mObbFile->readFrom(mFileName.string()))
<< "couldn't read from fake .obb file";
EXPECT_EQ(versionNum, mObbFile->getVersion())