wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1201997 - Part 3 - Make internally used methods private. r=froydn

Browse Source
This commit is contained in:
sajitk 2015-11-15 14:48:02 +01:00
parent 6381b45f6d
commit 9dca1c4f11
2 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xpcom/glue/nsDeque.h
View File

@ -140,11 +140,6 @@ 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
@ -161,8 +156,6 @@ public:
*/
void ForEach(nsDequeFunctor& aFunctor) const;
void SetDeallocator(nsDequeFunctor* aDeallocator);
size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
@ -192,5 +185,11 @@ private:
nsDeque& operator=(const nsDeque& aOther);
bool GrowCapacity();
void SetDeallocator(nsDequeFunctor* aDeallocator);
/**
* Remove all items from container without destroying them.
*/
void Empty();
};
#endif

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

@ -67,7 +67,7 @@ namespace TestNsDeque {
using namespace TestNsDeque;
TEST(NsDeque, OriginalTest)
TEST(NsDeque, OriginalTest)
{
const int size = 200;
int ints[size];
@ -181,8 +181,6 @@ TEST(NsDeque, OriginalFlaw)
}
}
TEST(NsDeque, TestObjectAt)
{
nsDeque d;
@ -279,27 +277,11 @@ TEST(NsDeque,TestEmpty)
EXPECT_EQ(nullptr, d.ObjectAt(0)) << "Invalid operation should return nullptr";
}
TEST(NsDeque,TestEmptyMethod)
TEST(NsDeque,TestEraseMethod)
{
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);
@ -343,35 +325,6 @@ TEST(NsDeque,TestEraseShouldCallDeallocator)
for (size_t i=0; i < NumTestValues; i++)
{
EXPECT_EQ(-1, *(testArray[i])) << "Erase should call deallocator: " << *(testArray[i]);
}
}
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";
}
}