diff options
author | Erwin Jansen <jansene@google.com> | 2018-11-21 16:09:40 -0800 |
---|---|---|
committer | Erwin Jansen <jansene@google.com> | 2018-11-27 10:24:19 -0800 |
commit | baf0508027872f50198e838fe1148b73a9b11b1f (patch) | |
tree | c1c350b5ec2b39c1c036e576968a003c84056028 /src/base/test/bottom_n_test.cpp | |
parent | 16661ba8c0103c2571e84a59a107c9e41dbe60dc (diff) |
CMake support to enable compilation under Visual Studio
- Add support for cmake
- Template fix to enable compilation with visual studio.
- Exclusion of static type tests under visual studio
- Fix unit tests due to declaration issues
Note we do not build the fuzzing target.
Test: All unit tests green on VS2017, MacOs, Linux
Change-Id: Ie8437f61d187fff03279c99fde0ff565e8f39b50
Diffstat (limited to 'src/base/test/bottom_n_test.cpp')
-rw-r--r-- | src/base/test/bottom_n_test.cpp | 27 |
1 files changed, 18 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)); |