Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: cc/CCTextureUpdateControllerTest.cpp

Issue 10916292: Adaptively throttle texture uploads (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Do not vary partial upload limit Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/CCTextureUpdateControllerTest.cpp
diff --git a/cc/CCTextureUpdateControllerTest.cpp b/cc/CCTextureUpdateControllerTest.cpp
index fd57bb2c031c6015c12d07c1d163c4089488df74..028ad03e047749a5fb5f291d8b7727b90d2dba37 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.";
-
// 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);
}

Powered by Google App Engine
This is Rietveld 408576698