Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 91536bfeff0f (bug 1201997)

Browse Source 
--HG--
extra : rebase_source : 6f11d67034e876738ecda6f1e32c8e655252660f
This commit is contained in:
Carsten "Tomcat" Book 2015-10-30 15:52:21 +01:00
parent 4c0ed54e29
commit eb7db9ff93
2 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xpcom/glue/nsDeque.h
View File

@ -140,6 +140,11 @@ public:
*/
void* ObjectAt(int aIndex) const;
/**
* Remove all items from container without destroying them.
*/
void Empty();
/**
* Remove and delete all items from container.
* Deletes are handled by the deallocator nsDequeFunctor
@ -156,6 +161,8 @@ public:
*/
void ForEach(nsDequeFunctor& aFunctor) const;
void SetDeallocator(nsDequeFunctor* aDeallocator);
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
@ -185,11 +192,5 @@ private:
nsDeque& operator=(const nsDeque& aOther);
bool GrowCapacity();
void SetDeallocator(nsDequeFunctor* aDeallocator);
/**
* Remove all items from container without destroying them.
*/
void Empty();
};
#endif

49
xpcom/glue/tests/gtest/TestNsDeque.cpp
View File

@ -181,6 +181,8 @@ TEST(NsDeque, OriginalFlaw)
}
}
TEST(NsDeque, TestObjectAt)
{
nsDeque d;
@ -277,11 +279,27 @@ TEST(NsDeque,TestEmpty)
EXPECT_EQ(nullptr, d.ObjectAt(0)) << "Invalid operation should return nullptr";
}
TEST(NsDeque,TestEraseMethod)
TEST(NsDeque,TestEmptyMethod)
{
nsDeque d;
size_t numberOfEntries = 8;
// Fill it up before calling Empty
for (size_t i = 0; i < numberOfEntries; i++) {
d.Push((void*)0xAA);
}
// Call empty
d.Empty();
// Now check it again.
EXPECT_EQ(0, d.GetSize()) <<"Size should be 0";
EXPECT_EQ(nullptr, d.Pop()) <<"Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.PopFront()) << "Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.Peek()) << "Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.PeekFront()) <<"Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.ObjectAt(0)) << "Invalid operation should return nullptr";
// Fill it up before calling Erase
for (size_t i = 0; i < numberOfEntries; i++) {
d.Push((void*)0xAA);
@ -328,6 +346,35 @@ TEST(NsDeque,TestEraseShouldCallDeallocator)
}
}
TEST(NsDeque,TestEmptyShouldNotCallDeallocator)
{
nsDeque d(new Deallocator());
const int NumTestValues = 8;
int* testArray[NumTestValues];
for (size_t i=0; i < NumTestValues; i++)
{
testArray[i] = new int();
*(testArray[i]) = i;
d.Push((void*)testArray[i]);
}
d.Empty();
// Now check it again.
EXPECT_EQ(0, d.GetSize()) <<"Size should be 0";
EXPECT_EQ(nullptr, d.Pop()) <<"Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.PopFront()) << "Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.Peek()) << "Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.PeekFront()) <<"Invalid operation should return nullptr";
EXPECT_EQ(nullptr, d.ObjectAt(0)) << "Invalid operation should return nullptr";
for (size_t i=0; i < NumTestValues; i++)
{
EXPECT_EQ(i, *(testArray[i])) << "Empty should not call deallocator";
}
}
TEST(NsDeque, TestForEachAndFirstThat)
{
nsDeque d(new Deallocator());