Index: cc/CCTextureUpdateControllerTest.cpp |
diff --git a/cc/CCTextureUpdateControllerTest.cpp b/cc/CCTextureUpdateControllerTest.cpp |
index fd57bb2c031c6015c12d07c1d163c4089488df74..fb7fb2a6060cdf99809add22a23c53578b482a13 100644 |
--- a/cc/CCTextureUpdateControllerTest.cpp |
+++ b/cc/CCTextureUpdateControllerTest.cpp |
@@ -115,6 +115,8 @@ public: |
void onBeginUploads() |
{ |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
+ |
m_numPreviousFlushes = 0; |
m_numPreviousUploads = 0; |
m_numBeginUploads++; |
@@ -136,8 +138,6 @@ public: |
void onEndUploads() |
{ |
- EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
- |
brianderson
2012/09/18 00:45:52
onEndUploads is called before the final flush to k
|
// Note: The m_numTotalUploads != m_fullUploadCountExpected comparison |
// allows for the quota not to be hit in the case where we are trasitioning |
// from full uploads to partial uploads. |
@@ -265,6 +265,7 @@ TEST_F(CCTextureUpdateControllerTest, OneFullUpload) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(1, m_numPreviousFlushes); |
EXPECT_EQ(1, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, OnePartialUpload) |
@@ -278,6 +279,7 @@ TEST_F(CCTextureUpdateControllerTest, OnePartialUpload) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(1, m_numPreviousFlushes); |
EXPECT_EQ(1, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, OneFullOnePartialUpload) |
@@ -293,6 +295,7 @@ TEST_F(CCTextureUpdateControllerTest, OneFullOnePartialUpload) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(2, m_numPreviousFlushes); |
EXPECT_EQ(2, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
@@ -315,6 +318,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullUploadsNoRemainder) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(fullUploadFlushMultipler, m_numPreviousFlushes); |
EXPECT_EQ(fullNoRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, ManyPartialUploadsNoRemainder) |
@@ -328,6 +332,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyPartialUploadsNoRemainder) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(partialUploadFlushMultipler, m_numPreviousFlushes); |
EXPECT_EQ(partialNoRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, ManyFullManyPartialUploadsNoRemainder) |
@@ -341,6 +346,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullManyPartialUploadsNoRemainder) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(fullUploadFlushMultipler + partialUploadFlushMultipler, m_numPreviousFlushes); |
EXPECT_EQ(fullNoRemainderCount + partialNoRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
@@ -364,6 +370,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullAndPartialMinRemainder) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(fullUploadFlushMultipler + partialUploadFlushMultipler + 2, m_numPreviousFlushes); |
EXPECT_EQ(fullMinRemainderCount + partialMinRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, ManyFullAndPartialUploadsMaxRemainder) |
@@ -377,6 +384,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullAndPartialUploadsMaxRemainder) |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(fullUploadFlushMultipler + partialUploadFlushMultipler, m_numPreviousFlushes); |
EXPECT_EQ(fullMaxRemainderCount + partialMaxRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, ManyFullMinRemainderManyPartialMaxRemainder) |
@@ -390,6 +398,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullMinRemainderManyPartialMaxRemainde |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ((fullUploadFlushMultipler+1) + partialUploadFlushMultipler, m_numPreviousFlushes); |
EXPECT_EQ(fullMinRemainderCount + partialMaxRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
TEST_F(CCTextureUpdateControllerTest, ManyFullMaxRemainderManyPartialMinRemainder) |
@@ -403,6 +412,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullMaxRemainderManyPartialMinRemainde |
EXPECT_EQ(1, m_numEndUploads); |
EXPECT_EQ(fullUploadFlushMultipler + (partialUploadFlushMultipler+1), m_numPreviousFlushes); |
EXPECT_EQ(fullMaxRemainderCount + partialMinRemainderCount, m_numPreviousUploads); |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
} |
@@ -467,6 +477,7 @@ TEST_F(CCTextureUpdateControllerTest, TripleUpdateFinalUpdateFullAndPartial) |
EXPECT_EQ(expectedPreviousUploads, m_numPreviousUploads); |
// Final sanity checks |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
EXPECT_EQ(kFullUploads + kPartialUploads, m_numTotalUploads); |
} |
@@ -515,6 +526,7 @@ TEST_F(CCTextureUpdateControllerTest, TripleUpdateFinalUpdateAllPartial) |
// Be lenient on the exact number of flushes here as well. |
// Final sanity checks |
+ EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush."; |
EXPECT_EQ(kFullUploads + kPartialUploads, m_numTotalUploads); |
} |
@@ -532,9 +544,9 @@ protected: |
class FakeCCTextureUpdateController : public cc::CCTextureUpdateController { |
public: |
- static PassOwnPtr<FakeCCTextureUpdateController> create(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader) |
+ static PassOwnPtr<FakeCCTextureUpdateController> create(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader, size_t maxPartialTextureUpdates) |
{ |
- return adoptPtr(new FakeCCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader)); |
+ return adoptPtr(new FakeCCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader, maxPartialTextureUpdates)); |
} |
void setMonotonicTimeNow(double time) { m_monotonicTimeNow = time; } |
@@ -545,8 +557,8 @@ public: |
virtual size_t updateMoreTexturesSize() const OVERRIDE { return m_updateMoreTexturesSize; } |
protected: |
- FakeCCTextureUpdateController(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader) |
- : cc::CCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader) |
+ FakeCCTextureUpdateController(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader, size_t maxPartialTextureUpdates) |
+ : cc::CCTextureUpdateController(client, thread, queue, resourceProvider, copier, uploader, maxPartialTextureUpdates) |
, m_monotonicTimeNow(0) |
, m_updateMoreTexturesTime(0) |
, m_updateMoreTexturesSize(0) { } |
@@ -573,7 +585,7 @@ TEST_F(CCTextureUpdateControllerTest, UpdateMoreTextures) |
appendPartialUploadsToUpdateQueue(0); |
DebugScopedSetImplThread implThread; |
- OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader)); |
+ OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader, 0)); |
controller->setMonotonicTimeNow(0); |
controller->setUpdateMoreTexturesTime(0.1); |
@@ -619,7 +631,7 @@ TEST_F(CCTextureUpdateControllerTest, NoMoreUpdates) |
appendPartialUploadsToUpdateQueue(0); |
DebugScopedSetImplThread implThread; |
- OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader)); |
+ OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader, 0)); |
controller->setMonotonicTimeNow(0); |
controller->setUpdateMoreTexturesTime(0.1); |
@@ -658,7 +670,7 @@ TEST_F(CCTextureUpdateControllerTest, UpdatesCompleteInFiniteTime) |
appendPartialUploadsToUpdateQueue(0); |
DebugScopedSetImplThread implThread; |
- OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader)); |
+ OwnPtr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.release(), m_resourceProvider.get(), &m_copier, &m_uploader, 0)); |
controller->setMonotonicTimeNow(0); |
controller->setUpdateMoreTexturesTime(0.5); |