[FixedDeque/FixedCircularDeque] Fix usage of std::vector -> std::deque

teslamotors · Jun 17, 2024 · 8d9ad90 · 8d9ad90
1 parent af2702b
commit 8d9ad90
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/test/fixed_circular_deque_test.cpp b/test/fixed_circular_deque_test.cpp
@@ -2049,11 +2049,11 @@ TEST(FixedCircularDeque, EraseRange)
         }
         {
             auto v =
-                Factory::template create<std::vector<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
+                Factory::template create<std::deque<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
             auto it = v.erase(v.begin(), std::next(v.begin(), 2));
             EXPECT_EQ(it, v.begin());
             EXPECT_EQ(v.size(), 2u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{}, {6, 7, 8}}));
         }
     };
 
@@ -2097,20 +2097,19 @@ TEST(FixedCircularDeque, EraseOne)
         }
         {
             auto v =
-                Factory::template create<std::vector<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
+                Factory::template create<std::deque<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
             auto it = v.erase(v.begin());
             EXPECT_EQ(it, v.begin());
             EXPECT_EQ(v.size(), 3u);
-            EXPECT_TRUE(
-                std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}, {}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}, {}, {6, 7, 8}}));
             it = v.erase(std::next(v.begin(), 1));
             EXPECT_EQ(it, std::next(v.begin(), 1));
             EXPECT_EQ(v.size(), 2u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}, {6, 7, 8}}));
             it = v.erase(std::next(v.begin(), 1));
             EXPECT_EQ(it, v.end());
             EXPECT_EQ(v.size(), 1u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}}));
         }
     };
 

diff --git a/test/fixed_deque_test.cpp b/test/fixed_deque_test.cpp
@@ -1735,11 +1735,11 @@ TEST(FixedDeque, EraseRange)
         }
         {
             auto v =
-                Factory::template create<std::vector<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
+                Factory::template create<std::deque<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
             auto it = v.erase(v.begin(), std::next(v.begin(), 2));
             EXPECT_EQ(it, v.begin());
             EXPECT_EQ(v.size(), 2u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{}, {6, 7, 8}}));
         }
     };
 
@@ -1783,20 +1783,19 @@ TEST(FixedDeque, EraseOne)
         }
         {
             auto v =
-                Factory::template create<std::vector<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
+                Factory::template create<std::deque<int>, 8>({{1, 2, 3}, {4, 5}, {}, {6, 7, 8}});
             auto it = v.erase(v.begin());
             EXPECT_EQ(it, v.begin());
             EXPECT_EQ(v.size(), 3u);
-            EXPECT_TRUE(
-                std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}, {}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}, {}, {6, 7, 8}}));
             it = v.erase(std::next(v.begin(), 1));
             EXPECT_EQ(it, std::next(v.begin(), 1));
             EXPECT_EQ(v.size(), 2u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}, {6, 7, 8}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}, {6, 7, 8}}));
             it = v.erase(std::next(v.begin(), 1));
             EXPECT_EQ(it, v.end());
             EXPECT_EQ(v.size(), 1u);
-            EXPECT_TRUE(std::ranges::equal(v, std::vector<std::vector<int>>{{4, 5}}));
+            EXPECT_TRUE(std::ranges::equal(v, std::deque<std::deque<int>>{{4, 5}}));
         }
     };