Index: cc/quads/quad_list_container_unittest.cc |
diff --git a/cc/quads/list_container_unittest.cc b/cc/quads/quad_list_container_unittest.cc |
similarity index 93% |
rename from cc/quads/list_container_unittest.cc |
rename to cc/quads/quad_list_container_unittest.cc |
index 5de1ddd1941b2b619c97f4152526e451d9ce229b..2d05d4d8f582c0177750dfac1c38efb0b689094d 100644 |
--- a/cc/quads/list_container_unittest.cc |
+++ b/cc/quads/quad_list_container_unittest.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "cc/quads/list_container.h" |
+#include "cc/base/list_container.h" |
#include <vector> |
#include "cc/quads/draw_quad.h" |
@@ -68,7 +68,7 @@ class MockDrawQuadSubclass : public MockDrawQuad { |
const size_t kLargestQuadSize = |
std::max(LargestDrawQuadSize(), sizeof(MockDrawQuadSubclass)); |
-TEST(ListContainerTest, ConstructorCalledInAllocateAndConstruct) { |
+TEST(QuadListContainerTest, ConstructorCalledInAllocateAndConstruct) { |
enne (OOO)
2015/05/26 18:31:28
I think these are really testing the list containe
prashant.n
2015/05/26 19:11:48
Ok I can revert this. But again problem comes, as
|
ListContainer<DrawQuad> list(kLargestQuadSize); |
size_t size = 2; |
@@ -85,7 +85,7 @@ TEST(ListContainerTest, ConstructorCalledInAllocateAndConstruct) { |
EXPECT_EQ(kMagicNumberToUseForDrawQuadTwo, dq_2->get_value()); |
} |
-TEST(ListContainerTest, DestructorCalled) { |
+TEST(QuadListContainerTest, DestructorCalled) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
size_t size = 1; |
@@ -96,7 +96,7 @@ TEST(ListContainerTest, DestructorCalled) { |
EXPECT_EQ(dq_1, list.front()); |
} |
-TEST(ListContainerTest, DestructorCalledOnceWhenClear) { |
+TEST(QuadListContainerTest, DestructorCalledOnceWhenClear) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
size_t size = 1; |
MockDrawQuad* dq_1 = list.AllocateAndConstruct<MockDrawQuad>(); |
@@ -118,7 +118,7 @@ TEST(ListContainerTest, DestructorCalledOnceWhenClear) { |
separator.Call(); |
} |
-TEST(ListContainerTest, ReplaceExistingElement) { |
+TEST(QuadListContainerTest, ReplaceExistingElement) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
size_t size = 1; |
MockDrawQuad* dq_1 = list.AllocateAndConstruct<MockDrawQuad>(); |
@@ -144,7 +144,7 @@ TEST(ListContainerTest, ReplaceExistingElement) { |
list.clear(); |
} |
-TEST(ListContainerTest, DestructorCalledOnceWhenErase) { |
+TEST(QuadListContainerTest, DestructorCalledOnceWhenErase) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
size_t size = 1; |
MockDrawQuad* dq_1 = list.AllocateAndConstruct<MockDrawQuad>(); |
@@ -166,7 +166,7 @@ TEST(ListContainerTest, DestructorCalledOnceWhenErase) { |
separator.Call(); |
} |
-TEST(ListContainerTest, SimpleIndexAccessSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleIndexAccessSharedQuadState) { |
ListContainer<SharedQuadState> list; |
size_t size = 3; |
@@ -182,7 +182,7 @@ TEST(ListContainerTest, SimpleIndexAccessSharedQuadState) { |
EXPECT_EQ(list.back(), list.ElementAt(2)); |
} |
-TEST(ListContainerTest, SimpleInsertionSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleInsertionSharedQuadState) { |
ListContainer<SharedQuadState> list; |
size_t size = 3; |
@@ -195,7 +195,7 @@ TEST(ListContainerTest, SimpleInsertionSharedQuadState) { |
EXPECT_EQ(sqs_3, list.back()); |
} |
-TEST(ListContainerTest, SimpleInsertionAndClearSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleInsertionAndClearSharedQuadState) { |
ListContainer<SharedQuadState> list; |
EXPECT_TRUE(list.empty()); |
EXPECT_EQ(0u, list.size()); |
@@ -215,7 +215,7 @@ TEST(ListContainerTest, SimpleInsertionAndClearSharedQuadState) { |
EXPECT_EQ(0u, list.size()); |
} |
-TEST(ListContainerTest, SimpleInsertionClearAndInsertAgainSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleInsertionClearAndInsertAgainSharedQuadState) { |
ListContainer<SharedQuadState> list; |
EXPECT_TRUE(list.empty()); |
EXPECT_EQ(0u, list.size()); |
@@ -246,7 +246,7 @@ TEST(ListContainerTest, SimpleInsertionClearAndInsertAgainSharedQuadState) { |
// This test is used to test when there is more than one allocation needed |
// for, ListContainer can still perform like normal vector. |
-TEST(ListContainerTest, |
+TEST(QuadListContainerTest, |
SimpleInsertionTriggerMoreThanOneAllocationSharedQuadState) { |
ListContainer<SharedQuadState> list(sizeof(SharedQuadState), 2); |
std::vector<SharedQuadState*> sqs_list; |
@@ -266,7 +266,7 @@ TEST(ListContainerTest, |
} |
} |
-TEST(ListContainerTest, |
+TEST(QuadListContainerTest, |
CorrectAllocationSizeForMoreThanOneAllocationSharedQuadState) { |
// Constructor sets the allocation size to 2. Every time ListContainer needs |
// to allocate again, it doubles allocation size. In this test, 10 elements is |
@@ -351,7 +351,7 @@ TEST(ListContainerTest, |
} |
} |
-TEST(ListContainerTest, SimpleIterationSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleIterationSharedQuadState) { |
ListContainer<SharedQuadState> list; |
std::vector<SharedQuadState*> sqs_list; |
size_t size = 10; |
@@ -388,7 +388,7 @@ TEST(ListContainerTest, SimpleIterationSharedQuadState) { |
EXPECT_EQ(num_iters_in_vector, num_iters_in_list); |
} |
-TEST(ListContainerTest, SimpleConstIteratorIterationSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleConstIteratorIterationSharedQuadState) { |
ListContainer<SharedQuadState> list; |
std::vector<const SharedQuadState*> sqs_list; |
size_t size = 10; |
@@ -433,7 +433,7 @@ TEST(ListContainerTest, SimpleConstIteratorIterationSharedQuadState) { |
} |
} |
-TEST(ListContainerTest, SimpleReverseInsertionSharedQuadState) { |
+TEST(QuadListContainerTest, SimpleReverseInsertionSharedQuadState) { |
ListContainer<SharedQuadState> list; |
std::vector<SharedQuadState*> sqs_list; |
size_t size = 10; |
@@ -465,7 +465,7 @@ TEST(ListContainerTest, SimpleReverseInsertionSharedQuadState) { |
} |
} |
-TEST(ListContainerTest, SimpleDeletion) { |
+TEST(QuadListContainerTest, SimpleDeletion) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
std::vector<SimpleDrawQuad*> sdq_list; |
size_t size = 10; |
@@ -487,7 +487,7 @@ TEST(ListContainerTest, SimpleDeletion) { |
} |
} |
-TEST(ListContainerTest, DeletionAllInAllocation) { |
+TEST(QuadListContainerTest, DeletionAllInAllocation) { |
const size_t kReserve = 10; |
ListContainer<DrawQuad> list(kLargestQuadSize, kReserve); |
std::vector<SimpleDrawQuad*> sdq_list; |
@@ -512,7 +512,7 @@ TEST(ListContainerTest, DeletionAllInAllocation) { |
EXPECT_EQ(0u, list.size()); |
} |
-TEST(ListContainerTest, DeletionAllInAllocationReversed) { |
+TEST(QuadListContainerTest, DeletionAllInAllocationReversed) { |
const size_t kReserve = 10; |
ListContainer<DrawQuad> list(kLargestQuadSize, kReserve); |
std::vector<SimpleDrawQuad*> sdq_list; |
@@ -568,7 +568,7 @@ TEST(ListContainerTest, DeletionAllInAllocationReversed) { |
} |
} |
-TEST(ListContainerTest, SimpleIterationAndManipulation) { |
+TEST(QuadListContainerTest, SimpleIterationAndManipulation) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
std::vector<SimpleDrawQuad*> sdq_list; |
size_t size = 10; |
@@ -593,7 +593,7 @@ TEST(ListContainerTest, SimpleIterationAndManipulation) { |
} |
} |
-TEST(ListContainerTest, SimpleManipulationWithIndexSimpleDrawQuad) { |
+TEST(QuadListContainerTest, SimpleManipulationWithIndexSimpleDrawQuad) { |
ListContainer<DrawQuad> list(kLargestQuadSize); |
std::vector<SimpleDrawQuad*> dq_list; |
size_t size = 10; |
@@ -614,7 +614,7 @@ TEST(ListContainerTest, SimpleManipulationWithIndexSimpleDrawQuad) { |
} |
} |
-TEST(ListContainerTest, |
+TEST(QuadListContainerTest, |
SimpleManipulationWithIndexMoreThanOneAllocationSimpleDrawQuad) { |
ListContainer<DrawQuad> list(LargestDrawQuadSize(), 2); |
std::vector<SimpleDrawQuad*> dq_list; |
@@ -636,7 +636,7 @@ TEST(ListContainerTest, |
} |
} |
-TEST(ListContainerTest, |
+TEST(QuadListContainerTest, |
SimpleIterationAndReverseIterationWithIndexSharedQuadState) { |
ListContainer<SharedQuadState> list; |
std::vector<SharedQuadState*> sqs_list; |