diff options
Diffstat (limited to 'src/base/test')
| -rw-r--r-- | src/base/test/bottom_n_test.cpp | 27 | ||||
| -rw-r--r-- | src/base/test/type_traits_test.cpp | 2 |
2 files changed, 20 insertions, 9 deletions
diff --git a/src/base/test/bottom_n_test.cpp b/src/base/test/bottom_n_test.cpp index 76f0123..71265d7 100644 --- a/src/base/test/bottom_n_test.cpp +++ b/src/base/test/bottom_n_test.cpp @@ -33,7 +33,8 @@ TEST(BottomN, Sort) { { BottomN<int> heap(10); EXPECT_TRUE(heap.Empty()); - pushAll(heap, (int[]){1, 2}); + int list[] = { 1,2 }; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 2); EXPECT_FALSE(heap.Empty()); @@ -42,7 +43,8 @@ TEST(BottomN, Sort) { { BottomN<int> heap(6); - pushAll(heap, (int[]){1, 4, 3, 2, 2, 1}); + int list[] = {1, 4, 3, 2, 2, 1}; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 6); EXPECT_THAT(heap.Pop(), ElementsAre(1, 1, 2, 2, 3, 4)); @@ -52,7 +54,8 @@ TEST(BottomN, Sort) { TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, (int[]){1, 2, 3, 4}); + int list[] = { 1, 2, 3, 4 }; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 4); heap.Push(0); @@ -63,10 +66,12 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, (int[]){4, 3, 2, 1}); + int list[] = { 4, 3, 2,1 }; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, (int[]){4, 4, 4, 4}); + int list2[] = { 4,4,4,4 }; + pushAll(heap, list2); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(1, 2, 3, 4)); @@ -74,10 +79,12 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, (int[]){4, 3, 2, 1}); + int list[] = { 4, 3, 2, 1 }; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, (int[]){5, 5, 5, 5}); + int list2[] = { 5, 5, 5, 5 }; + pushAll(heap, list2); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(1, 2, 3, 4)); @@ -85,10 +92,12 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, (int[]){4, 3, 2, 1}); + int list[] = { 4, 3, 2, 1 }; + pushAll(heap, list); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, (int[]){0, 0, 0, 0}); + int list2[] = { 0, 0, 0, 0 }; + pushAll(heap, list2); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(0, 0, 0, 0)); diff --git a/src/base/test/type_traits_test.cpp b/src/base/test/type_traits_test.cpp index b858c01..c724cbe 100644 --- a/src/base/test/type_traits_test.cpp +++ b/src/base/test/type_traits_test.cpp @@ -105,6 +105,7 @@ TEST(TypeTraits, IsTemplateInstantiation) { "nested std::vector<> is an instance of vector"); } +#ifndef _MSC_VER TEST(TypeTraits, IsRange) { static_assert(is_range<std::vector<int>>::value, "vector<> should be detected as a range"); @@ -123,6 +124,7 @@ TEST(TypeTraits, IsRange) { static_assert(!is_range<const int*>::value, "even const int* shouldn't be a range"); } +#endif } // namespace base } // namespace astc_codec |