Skip to content

Commit feb303e

Browse files
committed
Bug 1313469 - Part 1: Split out test functions. r=froydnj
This just splits out the test functions, no logic is changed. MozReview-Commit-ID: KjUA9rQ7iOS
1 parent aea4240 commit feb303e

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

xpcom/tests/TestCOMArray.cpp

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,8 @@ Bar::Release(void)
126126
return mRefCnt;
127127
}
128128

129-
130-
int main(int argc, char **argv)
129+
void Sizing()
131130
{
132-
ScopedXPCOM xpcom("nsCOMArrayTests");
133-
if (xpcom.failed()) {
134-
return 1;
135-
}
136-
137131
int rv = 0;
138132

139133
Array arr;
@@ -178,6 +172,10 @@ int main(int argc, char **argv)
178172
}
179173
}
180174

175+
}
176+
177+
void ObjectFunctions()
178+
{
181179
int32_t base;
182180
{
183181
Array2 arr2;
@@ -259,7 +257,11 @@ int main(int argc, char **argv)
259257
fail("Release called multiple times for Clear");
260258
}
261259
}
260+
}
262261

262+
void ElementFunctions()
263+
{
264+
int32_t base;
263265
{
264266
Array2 arr2;
265267

@@ -340,7 +342,11 @@ int main(int argc, char **argv)
340342
fail("Release called multiple times for Clear");
341343
}
342344
}
345+
}
343346

347+
void Destructor()
348+
{
349+
int32_t base;
344350
Bar::sReleaseCalled = 0;
345351

346352
{
@@ -358,6 +364,19 @@ int main(int argc, char **argv)
358364
if (Bar::sReleaseCalled != base + 20) {
359365
fail("Release called multiple times for nsCOMArray::~nsCOMArray");
360366
}
367+
}
368+
369+
int main(int argc, char **argv)
370+
{
371+
ScopedXPCOM xpcom("nsCOMArrayTests");
372+
if (xpcom.failed()) {
373+
return 1;
374+
}
375+
376+
Sizing();
377+
ObjectFunctions();
378+
ElementFunctions();
379+
Destructor();
361380

362-
return rv;
381+
return 0;
363382
}

0 commit comments

Comments
 (0)